From 1e7e19b4d1ddf05309e3e43d5ecb9138902b19b8 Mon Sep 17 00:00:00 2001 From: vasraz Date: Wed, 22 Mar 2023 23:14:29 +0000 Subject: [PATCH] Upgrade vulnerable dependencies Fix missing default no-args constructor Signed-off-by: Vasyl Razinkov Change-Id: Icfcbe0ec577b2d629179fa46e42141c196e08970 Issue-ID: SDC-4287 Issue-ID: SDC-4446 --- common-app-api/pom.xml | 2 +- common-be-tests-utils/pom.xml | 4 ++ common-be/pom.xml | 4 ++ .../org/onap/sdc/tosca/services/StrictMap.java | 55 ++++++++++++++++++++++ .../services/StrictMapAppenderConstructor.java | 19 +------- integration-tests/pom.xml | 2 +- pom.xml | 42 +++++++++++++++-- utils/webseal-simulator/pom.xml | 8 ++++ 8 files changed, 112 insertions(+), 24 deletions(-) create mode 100644 common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMap.java diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index 7f137acbb2..7e4baae68a 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -334,7 +334,7 @@ org.codehaus.jettison jettison - 1.3.3 + 1.5.3 diff --git a/common-be-tests-utils/pom.xml b/common-be-tests-utils/pom.xml index aa67b004f2..aeca54688f 100644 --- a/common-be-tests-utils/pom.xml +++ b/common-be-tests-utils/pom.xml @@ -28,6 +28,10 @@ com.squareup.okhttp3 okhttp + + com.fasterxml.jackson.core + jackson-annotations + diff --git a/common-be/pom.xml b/common-be/pom.xml index 0a57575916..74321488a1 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -32,6 +32,10 @@ com.squareup.okhttp3 okhttp + + com.fasterxml.jackson.core + jackson-annotations + diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMap.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMap.java new file mode 100644 index 0000000000..52cda7651a --- /dev/null +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMap.java @@ -0,0 +1,55 @@ +/* + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.sdc.tosca.services; + +import java.util.AbstractMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +public class StrictMap extends AbstractMap { + + private Map delegate; + + public StrictMap(Map delegate) { + this.delegate = delegate; + } + + @Override + public Object put(Object key, Object value) { + if (delegate == null) { + delegate = new LinkedHashMap<>(); + } + if (delegate.containsKey(key)) { + throw new IllegalStateException("duplicate key: " + key); + } + return delegate.put(key, value); + } + + @Override + public Set> entrySet() { + if (delegate == null) { + delegate = new LinkedHashMap<>(); + } + return delegate.entrySet(); + } +} diff --git a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMapAppenderConstructor.java b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMapAppenderConstructor.java index 678ba00724..08af90a768 100644 --- a/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMapAppenderConstructor.java +++ b/common/onap-tosca-datatype/src/main/java/org/onap/sdc/tosca/services/StrictMapAppenderConstructor.java @@ -19,9 +19,7 @@ */ package org.onap.sdc.tosca.services; -import java.util.AbstractMap; import java.util.Map; -import java.util.Set; import org.yaml.snakeyaml.constructor.Constructor; import org.yaml.snakeyaml.nodes.MappingNode; import org.yaml.snakeyaml.parser.ParserException; @@ -39,21 +37,7 @@ public class StrictMapAppenderConstructor extends Constructor { @Override protected Map createDefaultMap(int initSize) { - final Map delegate = super.createDefaultMap(initSize); - return new AbstractMap<>() { - @Override - public Object put(Object key, Object value) { - if (delegate.containsKey(key)) { - throw new IllegalStateException("duplicate key: " + key); - } - return delegate.put(key, value); - } - - @Override - public Set> entrySet() { - return delegate.entrySet(); - } - }; + return new StrictMap(super.createDefaultMap(initSize)); } @Override @@ -64,4 +48,5 @@ public class StrictMapAppenderConstructor extends Constructor { throw new ParserException("while parsing MappingNode", node.getStartMark(), exception.getMessage(), node.getEndMark()); } } + } diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index eea5c5afc7..3b47304c08 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -55,7 +55,7 @@ limitations under the License. 1.3.1 - 1.7.0 + 1.8.0 false diff --git a/pom.xml b/pom.xml index a211a0daac..ba2b8a7bf9 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ Modifications copyright (c) 2018-2019 Nokia 3.10 30.1-jre 0.3.3 - 5.3.20 + 5.3.25 2.2.13.RELEASE @@ -91,14 +91,14 @@ Modifications copyright (c) 2018-2019 Nokia 18.0.0 - 2.12.7 + 2.14.2 ${jackson.version} 2.1.1 false - 1.29 + 1.33 4.9 4.5.13 4.4.15 @@ -172,12 +172,12 @@ Modifications copyright (c) 2018-2019 Nokia /content/sites/site/org/openecomp/sdc/${project.version} 176c31dfe190a - 2.6.1.Final + 3.3.3 2.9.9 - 1.7.1 + 1.8.0 0.8.7 @@ -337,6 +337,18 @@ Modifications copyright (c) 2018-2019 Nokia org.bouncycastle * + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + @@ -353,6 +365,18 @@ Modifications copyright (c) 2018-2019 Nokia org.bouncycastle * + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + @@ -364,6 +388,14 @@ Modifications copyright (c) 2018-2019 Nokia org.bouncycastle * + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml index d9790e4708..73f22ef1da 100644 --- a/utils/webseal-simulator/pom.xml +++ b/utils/webseal-simulator/pom.xml @@ -65,6 +65,14 @@ org.apache.httpcomponents httpcore + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + -- 2.16.6