From 200889e7427038869127555aeb6bcd63809a453b Mon Sep 17 00:00:00 2001 From: tkogut Date: Thu, 26 Nov 2020 09:31:32 +0100 Subject: Update Reactor version and upgrade TestContainers Issue-ID: DCAEGEN2-2532 Signed-off-by: tkogut Change-Id: Ic92bdbb7b82055e7b9ec211d50d04f6843b4ca5e --- pom.xml | 8 ++++---- rest-services/cbs-client/pom.xml | 2 +- rest-services/dmaap-client/pom.xml | 2 +- rest-services/http-client/pom.xml | 4 ++-- rest-services/model/pom.xml | 4 ++-- rest-services/pom.xml | 2 +- security/crypt-password/pom.xml | 2 +- security/pom.xml | 2 +- security/ssl/pom.xml | 2 +- services/external-schema-manager/pom.xml | 2 +- services/hv-ves-client/pom.xml | 4 ++-- services/hv-ves-client/producer/api/pom.xml | 4 ++-- services/hv-ves-client/producer/ct/pom.xml | 4 ++-- .../sdk/services/hvves/client/producer/ct/DummyCollector.java | 4 ++-- services/hv-ves-client/producer/impl/pom.xml | 4 ++-- services/hv-ves-client/producer/pom.xml | 4 ++-- services/hv-ves-client/protobuf/pom.xml | 4 ++-- services/pom.xml | 4 ++-- standardization/api-custom-header/pom.xml | 2 +- standardization/moher-api/healthstate/pom.xml | 4 ++-- standardization/moher-api/metrics/pom.xml | 4 ++-- standardization/moher-api/pom.xml | 4 ++-- standardization/moher-api/server-adapters/pom.xml | 4 ++-- standardization/moher-api/server-adapters/reactor-netty/pom.xml | 4 ++-- standardization/moher-api/server-adapters/spring-webflux/pom.xml | 4 ++-- standardization/pom.xml | 2 +- version.properties | 4 ++-- 27 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pom.xml b/pom.xml index 61b5664b..7b6186ca 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.onap.dcaegen2.services sdk - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT dcaegen2-services-sdk Common SDK repo for all DCAE Services @@ -65,7 +65,7 @@ 1.3.1 2.7.5 3.12.2 - Californium-SR8 + 2020.0.1 1.7.25 1.2.3 2.28.2 @@ -74,8 +74,8 @@ 1.6 16.0.3 3.6.0.2 - 1.14.3 - 2.3.3.RELEASE + 1.15.0 + 2.4.0 1.17.2 1.0.3 diff --git a/rest-services/cbs-client/pom.xml b/rest-services/cbs-client/pom.xml index 66600f6c..3b4af49f 100644 --- a/rest-services/cbs-client/pom.xml +++ b/rest-services/cbs-client/pom.xml @@ -7,7 +7,7 @@ org.onap.dcaegen2.services.sdk dcaegen2-services-sdk-rest-services - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT org.onap.dcaegen2.services.sdk.rest.services diff --git a/rest-services/dmaap-client/pom.xml b/rest-services/dmaap-client/pom.xml index 9eb118b1..f81b04f4 100644 --- a/rest-services/dmaap-client/pom.xml +++ b/rest-services/dmaap-client/pom.xml @@ -7,7 +7,7 @@ org.onap.dcaegen2.services.sdk dcaegen2-services-sdk-rest-services - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT org.onap.dcaegen2.services.sdk.rest.services diff --git a/rest-services/http-client/pom.xml b/rest-services/http-client/pom.xml index 64ac6037..bae2f662 100644 --- a/rest-services/http-client/pom.xml +++ b/rest-services/http-client/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START==================================== ~ DCAEGEN2-SERVICES-SDK ~ ========================================================= - ~ Copyright (C) 2019 Nokia. All rights reserved. + ~ Copyright (C) 2019-2020 Nokia. 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. @@ -28,7 +28,7 @@ org.onap.dcaegen2.services.sdk dcaegen2-services-sdk-rest-services - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT org.onap.dcaegen2.services.sdk.rest.services diff --git a/rest-services/model/pom.xml b/rest-services/model/pom.xml index bd91a8ce..52887c40 100644 --- a/rest-services/model/pom.xml +++ b/rest-services/model/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START==================================== ~ DCAEGEN2-SERVICES-SDK ~ ========================================================= - ~ Copyright (C) 2019 Nokia. All rights reserved. + ~ Copyright (C) 2019-2020 Nokia. 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. @@ -27,7 +27,7 @@ org.onap.dcaegen2.services.sdk dcaegen2-services-sdk-rest-services - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT org.onap.dcaegen2.services.sdk.rest.services diff --git a/rest-services/pom.xml b/rest-services/pom.xml index de360272..dff5a10b 100644 --- a/rest-services/pom.xml +++ b/rest-services/pom.xml @@ -7,7 +7,7 @@ org.onap.dcaegen2.services sdk - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT org.onap.dcaegen2.services.sdk diff --git a/security/crypt-password/pom.xml b/security/crypt-password/pom.xml index 02344326..911545e3 100644 --- a/security/crypt-password/pom.xml +++ b/security/crypt-password/pom.xml @@ -6,7 +6,7 @@ org.onap.dcaegen2.services.sdk.security dcaegen2-services-sdk-security - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT 4.0.0 diff --git a/security/pom.xml b/security/pom.xml index 70a451b9..f717c336 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -7,7 +7,7 @@ org.onap.dcaegen2.services sdk - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT org.onap.dcaegen2.services.sdk.security diff --git a/security/ssl/pom.xml b/security/ssl/pom.xml index f62e0aa1..a2406f52 100644 --- a/security/ssl/pom.xml +++ b/security/ssl/pom.xml @@ -6,7 +6,7 @@ org.onap.dcaegen2.services.sdk.security dcaegen2-services-sdk-security - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT ssl diff --git a/services/external-schema-manager/pom.xml b/services/external-schema-manager/pom.xml index f25af85d..7bbb664e 100644 --- a/services/external-schema-manager/pom.xml +++ b/services/external-schema-manager/pom.xml @@ -7,7 +7,7 @@ org.onap.dcaegen2.services.sdk dcaegen2-services-sdk-services - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT dcaegen2-services-sdk-services-external-schema-manager diff --git a/services/hv-ves-client/pom.xml b/services/hv-ves-client/pom.xml index bfcdc490..bb572254 100644 --- a/services/hv-ves-client/pom.xml +++ b/services/hv-ves-client/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ DCAEGEN2-SERVICES-SDK ~ ================================================================================ - ~ Copyright (C) 2019 Nokia + ~ Copyright (C) 2019-2020 Nokia ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ org.onap.dcaegen2.services.sdk dcaegen2-services-sdk-services - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT dcaegen2-services-sdk-services-hvvesclient diff --git a/services/hv-ves-client/producer/api/pom.xml b/services/hv-ves-client/producer/api/pom.xml index f45a7c64..eb15bb76 100644 --- a/services/hv-ves-client/producer/api/pom.xml +++ b/services/hv-ves-client/producer/api/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ DCAEGEN2-SERVICES-SDK ~ ================================================================================ - ~ Copyright (C) 2019 Nokia + ~ Copyright (C) 2019-2020 Nokia ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ org.onap.dcaegen2.services.sdk hvvesclient-producer - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT hvvesclient-producer-api diff --git a/services/hv-ves-client/producer/ct/pom.xml b/services/hv-ves-client/producer/ct/pom.xml index 89a963cd..7b2ab31e 100644 --- a/services/hv-ves-client/producer/ct/pom.xml +++ b/services/hv-ves-client/producer/ct/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ DCAEGEN2-SERVICES-SDK ~ ================================================================================ - ~ Copyright (C) 2019 Nokia + ~ Copyright (C) 2019-2020 Nokia ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ org.onap.dcaegen2.services.sdk hvvesclient-producer - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT hvvesclient-producer-ct diff --git a/services/hv-ves-client/producer/ct/src/test/java/org/onap/dcaegen2/services/sdk/services/hvves/client/producer/ct/DummyCollector.java b/services/hv-ves-client/producer/ct/src/test/java/org/onap/dcaegen2/services/sdk/services/hvves/client/producer/ct/DummyCollector.java index 70e9cdff..10c0104b 100644 --- a/services/hv-ves-client/producer/ct/src/test/java/org/onap/dcaegen2/services/sdk/services/hvves/client/producer/ct/DummyCollector.java +++ b/services/hv-ves-client/producer/ct/src/test/java/org/onap/dcaegen2/services/sdk/services/hvves/client/producer/ct/DummyCollector.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * DCAEGEN2-SERVICES-SDK * ================================================================================ - * Copyright (C) 2019 Nokia. All rights reserved. + * Copyright (C) 2019-2020 Nokia. 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. @@ -67,7 +67,7 @@ public class DummyCollector { .wiretap(true) .handle(this::handleConnection); server = tcpServer.bindNow(); - return server.address(); + return (InetSocketAddress) server.address(); } public void stop() { diff --git a/services/hv-ves-client/producer/impl/pom.xml b/services/hv-ves-client/producer/impl/pom.xml index 547b9f69..9abb2c4d 100644 --- a/services/hv-ves-client/producer/impl/pom.xml +++ b/services/hv-ves-client/producer/impl/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ DCAEGEN2-SERVICES-SDK ~ ================================================================================ - ~ Copyright (C) 2019 Nokia + ~ Copyright (C) 2019-2020 Nokia ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ org.onap.dcaegen2.services.sdk hvvesclient-producer - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT hvvesclient-producer-impl diff --git a/services/hv-ves-client/producer/pom.xml b/services/hv-ves-client/producer/pom.xml index 8e310252..66c5ff0c 100644 --- a/services/hv-ves-client/producer/pom.xml +++ b/services/hv-ves-client/producer/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ DCAEGEN2-SERVICES-SDK ~ ================================================================================ - ~ Copyright (C) 2019 Nokia + ~ Copyright (C) 2019-2020 Nokia ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ org.onap.dcaegen2.services.sdk dcaegen2-services-sdk-services-hvvesclient - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT hvvesclient-producer diff --git a/services/hv-ves-client/protobuf/pom.xml b/services/hv-ves-client/protobuf/pom.xml index 5fe47d07..c7921213 100644 --- a/services/hv-ves-client/protobuf/pom.xml +++ b/services/hv-ves-client/protobuf/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ DCAEGEN2-SERVICES-SDK ~ ================================================================================ - ~ Copyright (C) 2019 Nokia + ~ Copyright (C) 2019-2020 Nokia ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ dcaegen2-services-sdk-services-hvvesclient org.onap.dcaegen2.services.sdk - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT High Volume VES Collector Client :: Protobuf diff --git a/services/pom.xml b/services/pom.xml index 4490b568..62756722 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ DCAEGEN2-SERVICES-SDK ~ ================================================================================ - ~ Copyright (C) 2019 Nokia + ~ Copyright (C) 2019-2020 Nokia ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ org.onap.dcaegen2.services sdk - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT org.onap.dcaegen2.services.sdk diff --git a/standardization/api-custom-header/pom.xml b/standardization/api-custom-header/pom.xml index 6c8c255f..c4c2aa47 100644 --- a/standardization/api-custom-header/pom.xml +++ b/standardization/api-custom-header/pom.xml @@ -7,7 +7,7 @@ org.onap.dcaegen2.services.sdk dcaegen2-services-sdk-standardization - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT .. diff --git a/standardization/moher-api/healthstate/pom.xml b/standardization/moher-api/healthstate/pom.xml index 39c8a0eb..3ec0f3a6 100644 --- a/standardization/moher-api/healthstate/pom.xml +++ b/standardization/moher-api/healthstate/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ DCAEGEN2-SERVICES-SDK ~ ================================================================================ - ~ Copyright (C) 2019 Nokia + ~ Copyright (C) 2019-2020 Nokia ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ dcaegen2-sdk-moher-api org.onap.dcaegen2.services.sdk - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT Monitoring and Healthcheck :: Health state diff --git a/standardization/moher-api/metrics/pom.xml b/standardization/moher-api/metrics/pom.xml index 4dae6aca..3794d172 100644 --- a/standardization/moher-api/metrics/pom.xml +++ b/standardization/moher-api/metrics/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ DCAEGEN2-SERVICES-SDK ~ ================================================================================ - ~ Copyright (C) 2019 Nokia + ~ Copyright (C) 2019-2020 Nokia ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ dcaegen2-sdk-moher-api org.onap.dcaegen2.services.sdk - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT Monitoring and Healthcheck :: Metrics diff --git a/standardization/moher-api/pom.xml b/standardization/moher-api/pom.xml index d4f9cbf2..63517118 100644 --- a/standardization/moher-api/pom.xml +++ b/standardization/moher-api/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ DCAEGEN2-SERVICES-SDK ~ ================================================================================ - ~ Copyright (C) 2019 Nokia + ~ Copyright (C) 2019-2020 Nokia ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ dcaegen2-services-sdk-standardization org.onap.dcaegen2.services.sdk - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT Monitoring and Healthcheck diff --git a/standardization/moher-api/server-adapters/pom.xml b/standardization/moher-api/server-adapters/pom.xml index e0beee4d..42a9b45e 100644 --- a/standardization/moher-api/server-adapters/pom.xml +++ b/standardization/moher-api/server-adapters/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ DCAEGEN2-SERVICES-SDK ~ ================================================================================ - ~ Copyright (C) 2019 Nokia + ~ Copyright (C) 2019-2020 Nokia ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ dcaegen2-sdk-moher-api org.onap.dcaegen2.services.sdk - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT Monitoring and Healthcheck :: Server Adapters diff --git a/standardization/moher-api/server-adapters/reactor-netty/pom.xml b/standardization/moher-api/server-adapters/reactor-netty/pom.xml index 2051e1d8..c731124b 100644 --- a/standardization/moher-api/server-adapters/reactor-netty/pom.xml +++ b/standardization/moher-api/server-adapters/reactor-netty/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ DCAEGEN2-SERVICES-SDK ~ ================================================================================ - ~ Copyright (C) 2019 Nokia + ~ Copyright (C) 2019-2020 Nokia ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ dcaegen2-sdk-moher-server-adapters org.onap.dcaegen2.services.sdk - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT Monitoring and Healthcheck :: Server Adapters :: Reactor Netty diff --git a/standardization/moher-api/server-adapters/spring-webflux/pom.xml b/standardization/moher-api/server-adapters/spring-webflux/pom.xml index 43f5552a..48a9743d 100644 --- a/standardization/moher-api/server-adapters/spring-webflux/pom.xml +++ b/standardization/moher-api/server-adapters/spring-webflux/pom.xml @@ -3,7 +3,7 @@ ~ ============LICENSE_START======================================================= ~ DCAEGEN2-SERVICES-SDK ~ ================================================================================ - ~ Copyright (C) 2019 Nokia + ~ Copyright (C) 2019-2020 Nokia ~ ================================================================================ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ dcaegen2-sdk-moher-server-adapters org.onap.dcaegen2.services.sdk - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT Monitoring and Healthcheck :: Server Adapters :: Spring Webflux diff --git a/standardization/pom.xml b/standardization/pom.xml index 8572218b..dcf781fa 100644 --- a/standardization/pom.xml +++ b/standardization/pom.xml @@ -8,7 +8,7 @@ org.onap.dcaegen2.services sdk - 1.4.4-SNAPSHOT + 1.5.0-SNAPSHOT .. diff --git a/version.properties b/version.properties index 9e50923f..68bc8f55 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 -minor=4 -patch=4 +minor=5 +patch=0 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT -- cgit 1.2.3-korg