diff options
author | pwielebs <piotr.wielebski@nokia.com> | 2019-11-13 12:38:28 +0100 |
---|---|---|
committer | pwielebs <piotr.wielebski@nokia.com> | 2019-11-13 12:38:28 +0100 |
commit | e5e5fd19bd18d08e9d9985a74387137c13935e44 (patch) | |
tree | 05685b6f7f96aa0f4299caabfbb74ec9f87ed002 | |
parent | 3236d78ea38211812fdd862453416286ae5df3b7 (diff) |
Fix DCAE-SDK static code vulnerabilities
- Update patch version of SDK
Change-Id: I2896e1bda3e09d27c0e3a9674861dc950ed43741
Issue-ID: DCAEGEN2-1917
Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
28 files changed, 32 insertions, 29 deletions
@@ -11,7 +11,7 @@ <groupId>org.onap.dcaegen2.services</groupId> <artifactId>sdk</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <name>dcaegen2-services-sdk</name> <description>Common SDK repo for all DCAE Services</description> @@ -75,7 +75,7 @@ <jetbrains-annotations.version>16.0.3</jetbrains-annotations.version> <protoc-jar-maven-plugin.version>3.6.0.2</protoc-jar-maven-plugin.version> <testcontainers.version>1.12.0</testcontainers.version> - <spring.boot.version>2.1.5.RELEASE</spring.boot.version> + <spring.boot.version>2.2.1.RELEASE</spring.boot.version> </properties> <modules> diff --git a/rest-services/aai-client/pom.xml b/rest-services/aai-client/pom.xml index 6cea5af1..798d61db 100644 --- a/rest-services/aai-client/pom.xml +++ b/rest-services/aai-client/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>dcaegen2-services-sdk-rest-services</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId> diff --git a/rest-services/cbs-client/pom.xml b/rest-services/cbs-client/pom.xml index 8c081417..a9aace8a 100644 --- a/rest-services/cbs-client/pom.xml +++ b/rest-services/cbs-client/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>dcaegen2-services-sdk-rest-services</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId> diff --git a/rest-services/dmaap-client/pom.xml b/rest-services/dmaap-client/pom.xml index a4c46d41..f7cb3bcc 100644 --- a/rest-services/dmaap-client/pom.xml +++ b/rest-services/dmaap-client/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>dcaegen2-services-sdk-rest-services</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId> diff --git a/rest-services/http-client/pom.xml b/rest-services/http-client/pom.xml index d3b8f124..be343ad8 100644 --- a/rest-services/http-client/pom.xml +++ b/rest-services/http-client/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>dcaegen2-services-sdk-rest-services</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId> diff --git a/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpHeaders.java b/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpHeaders.java index 4ef43a59..c9ea7e6f 100644 --- a/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpHeaders.java +++ b/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/HttpHeaders.java @@ -31,4 +31,6 @@ public final class HttpHeaders { public static final String CONTENT_TYPE = "Content-Type"; public static final String CONTENT_LENGTH = "Content-Length"; + public static final String CHUNKED = "chunked"; + public static final String TRANSFER_ENCODING_TYPE = "Transfer-Encoding"; } diff --git a/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClient.java b/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClient.java index 234a3800..7ac02bf6 100644 --- a/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClient.java +++ b/rest-services/http-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/adapters/http/RxHttpClient.java @@ -20,7 +20,6 @@ package org.onap.dcaegen2.services.sdk.rest.services.adapters.http; import io.vavr.collection.Stream; -import java.util.stream.Collectors; import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,6 +29,8 @@ import reactor.netty.http.client.HttpClient.ResponseReceiver; import reactor.netty.http.client.HttpClientRequest; import reactor.netty.http.client.HttpClientResponse; +import java.util.stream.Collectors; + /** * @since 1.1.4 */ @@ -71,7 +72,7 @@ public class RxHttpClient { private ResponseReceiver<?> prepareBodyChunked(HttpRequest request, HttpClient theClient) { return theClient - .chunkedTransfer(true) + .headers(hdrs -> hdrs.set(HttpHeaders.TRANSFER_ENCODING_TYPE, HttpHeaders.CHUNKED)) .request(request.method().asNetty()) .send(request.body().contents()) .uri(request.url()); diff --git a/rest-services/model/pom.xml b/rest-services/model/pom.xml index 74d0556f..69e50876 100644 --- a/rest-services/model/pom.xml +++ b/rest-services/model/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>dcaegen2-services-sdk-rest-services</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId> diff --git a/rest-services/pom.xml b/rest-services/pom.xml index 0b434e3a..6f7150fb 100644 --- a/rest-services/pom.xml +++ b/rest-services/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.onap.dcaegen2.services</groupId> <artifactId>sdk</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> diff --git a/security/crypt-password/pom.xml b/security/crypt-password/pom.xml index 5e3152b7..85b99410 100644 --- a/security/crypt-password/pom.xml +++ b/security/crypt-password/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk.security</groupId> <artifactId>dcaegen2-services-sdk-security</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/security/pom.xml b/security/pom.xml index 7ba50abc..6baf182b 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.onap.dcaegen2.services</groupId> <artifactId>sdk</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.dcaegen2.services.sdk.security</groupId> diff --git a/security/ssl/pom.xml b/security/ssl/pom.xml index 98b9b99e..1c6456d5 100644 --- a/security/ssl/pom.xml +++ b/security/ssl/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk.security</groupId> <artifactId>dcaegen2-services-sdk-security</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <artifactId>ssl</artifactId> diff --git a/services/hv-ves-client/pom.xml b/services/hv-ves-client/pom.xml index abd77a25..20129bcb 100644 --- a/services/hv-ves-client/pom.xml +++ b/services/hv-ves-client/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>dcaegen2-services-sdk-services</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <artifactId>dcaegen2-services-sdk-services-hvvesclient</artifactId> diff --git a/services/hv-ves-client/producer/api/pom.xml b/services/hv-ves-client/producer/api/pom.xml index 9311a339..cde2f657 100644 --- a/services/hv-ves-client/producer/api/pom.xml +++ b/services/hv-ves-client/producer/api/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>hvvesclient-producer</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <artifactId>hvvesclient-producer-api</artifactId> diff --git a/services/hv-ves-client/producer/ct/pom.xml b/services/hv-ves-client/producer/ct/pom.xml index a92a1b96..af25bd8e 100644 --- a/services/hv-ves-client/producer/ct/pom.xml +++ b/services/hv-ves-client/producer/ct/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>hvvesclient-producer</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <artifactId>hvvesclient-producer-ct</artifactId> diff --git a/services/hv-ves-client/producer/impl/pom.xml b/services/hv-ves-client/producer/impl/pom.xml index 6d3abbc6..422a1cb7 100644 --- a/services/hv-ves-client/producer/impl/pom.xml +++ b/services/hv-ves-client/producer/impl/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>hvvesclient-producer</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <artifactId>hvvesclient-producer-impl</artifactId> diff --git a/services/hv-ves-client/producer/pom.xml b/services/hv-ves-client/producer/pom.xml index 164ebc80..bb907cca 100644 --- a/services/hv-ves-client/producer/pom.xml +++ b/services/hv-ves-client/producer/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>dcaegen2-services-sdk-services-hvvesclient</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <artifactId>hvvesclient-producer</artifactId> diff --git a/services/hv-ves-client/protobuf/pom.xml b/services/hv-ves-client/protobuf/pom.xml index 8bf9b7d8..6b892ec7 100644 --- a/services/hv-ves-client/protobuf/pom.xml +++ b/services/hv-ves-client/protobuf/pom.xml @@ -26,7 +26,7 @@ <parent> <artifactId>dcaegen2-services-sdk-services-hvvesclient</artifactId> <groupId>org.onap.dcaegen2.services.sdk</groupId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <name>High Volume VES Collector Client :: Protobuf</name> diff --git a/services/pom.xml b/services/pom.xml index c1a7190a..51351eac 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.dcaegen2.services</groupId> <artifactId>sdk</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> diff --git a/standardization/api-custom-header/pom.xml b/standardization/api-custom-header/pom.xml index 1f7b40b9..a2626f7b 100644 --- a/standardization/api-custom-header/pom.xml +++ b/standardization/api-custom-header/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>dcaegen2-services-sdk-standardization</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>..</relativePath> </parent> diff --git a/standardization/moher-api/healthstate/pom.xml b/standardization/moher-api/healthstate/pom.xml index ef39b798..f6dceda2 100644 --- a/standardization/moher-api/healthstate/pom.xml +++ b/standardization/moher-api/healthstate/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>dcaegen2-sdk-moher-api</artifactId> <groupId>org.onap.dcaegen2.services.sdk</groupId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <name>Monitoring and Healthcheck :: Health state</name> diff --git a/standardization/moher-api/metrics/pom.xml b/standardization/moher-api/metrics/pom.xml index 52b4d4e9..fa11329a 100644 --- a/standardization/moher-api/metrics/pom.xml +++ b/standardization/moher-api/metrics/pom.xml @@ -26,7 +26,7 @@ <parent> <artifactId>dcaegen2-sdk-moher-api</artifactId> <groupId>org.onap.dcaegen2.services.sdk</groupId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <name>Monitoring and Healthcheck :: Metrics</name> diff --git a/standardization/moher-api/pom.xml b/standardization/moher-api/pom.xml index 1af5a3c4..492399ba 100644 --- a/standardization/moher-api/pom.xml +++ b/standardization/moher-api/pom.xml @@ -26,7 +26,7 @@ <parent> <artifactId>dcaegen2-services-sdk-standardization</artifactId> <groupId>org.onap.dcaegen2.services.sdk</groupId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <name>Monitoring and Healthcheck</name> diff --git a/standardization/moher-api/server-adapters/pom.xml b/standardization/moher-api/server-adapters/pom.xml index ae8a1521..c63bcf2a 100644 --- a/standardization/moher-api/server-adapters/pom.xml +++ b/standardization/moher-api/server-adapters/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>dcaegen2-sdk-moher-api</artifactId> <groupId>org.onap.dcaegen2.services.sdk</groupId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <name>Monitoring and Healthcheck :: Server Adapters</name> diff --git a/standardization/moher-api/server-adapters/reactor-netty/pom.xml b/standardization/moher-api/server-adapters/reactor-netty/pom.xml index 24d9031f..faa6b060 100644 --- a/standardization/moher-api/server-adapters/reactor-netty/pom.xml +++ b/standardization/moher-api/server-adapters/reactor-netty/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>dcaegen2-sdk-moher-server-adapters</artifactId> <groupId>org.onap.dcaegen2.services.sdk</groupId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <name>Monitoring and Healthcheck :: Server Adapters :: Reactor Netty</name> diff --git a/standardization/moher-api/server-adapters/spring-webflux/pom.xml b/standardization/moher-api/server-adapters/spring-webflux/pom.xml index 6efa37b4..c7e1a956 100644 --- a/standardization/moher-api/server-adapters/spring-webflux/pom.xml +++ b/standardization/moher-api/server-adapters/spring-webflux/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>dcaegen2-sdk-moher-server-adapters</artifactId> <groupId>org.onap.dcaegen2.services.sdk</groupId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> </parent> <name>Monitoring and Healthcheck :: Server Adapters :: Spring Webflux</name> diff --git a/standardization/pom.xml b/standardization/pom.xml index 2ecd3311..fcf48473 100644 --- a/standardization/pom.xml +++ b/standardization/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.onap.dcaegen2.services</groupId> <artifactId>sdk</artifactId> - <version>1.3.2-SNAPSHOT</version> + <version>1.3.3-SNAPSHOT</version> <relativePath>..</relativePath> </parent> diff --git a/version.properties b/version.properties index ef20baaf..fd60497b 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 minor=3 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT |