diff options
| author |   tkogut <tomasz.kogut@nokia.com> | 2020-11-26 09:31:32 +0100 |
|---|---|---|
| committer | tkogut <tomasz.kogut@nokia.com> | 2020-11-27 13:24:14 +0100 |
| commit | 200889e7427038869127555aeb6bcd63809a453b (patch) | |
| tree | b122476d079fc0fa8501e028f0f2ee428c57b2f2 | |
| parent | c610bf0763522c2de5b68c9a7670a9bd269ad262 (diff) | |
Update Reactor version and upgrade TestContainers
Issue-ID: DCAEGEN2-2532
Signed-off-by: tkogut <tomasz.kogut@nokia.com>
Change-Id: Ic92bdbb7b82055e7b9ec211d50d04f6843b4ca5e
27 files changed, 47 insertions, 47 deletions
@@ -11,7 +11,7 @@ <groupId>org.onap.dcaegen2.services</groupId> <artifactId>sdk</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <name>dcaegen2-services-sdk</name> <description>Common SDK repo for all DCAE Services</description> @@ -65,7 +65,7 @@ <junit-platform.version>1.3.1</junit-platform.version> <immutables.version>2.7.5</immutables.version> <assertj-core.version>3.12.2</assertj-core.version> - <reactor.bom.version>Californium-SR8</reactor.bom.version> + <reactor.bom.version>2020.0.1</reactor.bom.version> <slf4j.version>1.7.25</slf4j.version> <logback.version>1.2.3</logback.version> <mockito.version>2.28.2</mockito.version> @@ -74,8 +74,8 @@ <commons-text.version>1.6</commons-text.version> <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.14.3</testcontainers.version> - <spring.boot.version>2.3.3.RELEASE</spring.boot.version> + <testcontainers.version>1.15.0</testcontainers.version> + <spring.boot.version>2.4.0</spring.boot.version> <system.rules.version>1.17.2</system.rules.version> <openapi4j.version>1.0.3</openapi4j.version> <sonar.coverage.jacoco.xmlReportPaths> 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 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>dcaegen2-services-sdk-rest-services</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-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 9eb118b1..f81b04f4 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.4.4-SNAPSHOT</version> + <version>1.5.0-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 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 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>dcaegen2-services-sdk-rest-services</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> </parent> <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId> 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 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>dcaegen2-services-sdk-rest-services</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-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 de360272..dff5a10b 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.4.4-SNAPSHOT</version> + <version>1.5.0-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 02344326..911545e3 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.4.4-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> 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 @@ <parent> <groupId>org.onap.dcaegen2.services</groupId> <artifactId>sdk</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> </parent> <groupId>org.onap.dcaegen2.services.sdk.security</groupId> 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 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk.security</groupId> <artifactId>dcaegen2-services-sdk-security</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> </parent> <artifactId>ssl</artifactId> 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 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>dcaegen2-services-sdk-services</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> </parent> <artifactId>dcaegen2-services-sdk-services-external-schema-manager</artifactId> 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 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>dcaegen2-services-sdk-services</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-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 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 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>hvvesclient-producer</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-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 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 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>hvvesclient-producer</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> </parent> <artifactId>hvvesclient-producer-ct</artifactId> 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 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>hvvesclient-producer</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-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 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 @@ <parent> <groupId>org.onap.dcaegen2.services.sdk</groupId> <artifactId>dcaegen2-services-sdk-services-hvvesclient</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-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 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 @@ <parent> <artifactId>dcaegen2-services-sdk-services-hvvesclient</artifactId> <groupId>org.onap.dcaegen2.services.sdk</groupId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> </parent> <name>High Volume VES Collector Client :: Protobuf</name> 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 @@ <parent> <groupId>org.onap.dcaegen2.services</groupId> <artifactId>sdk</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-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 6c8c255f..c4c2aa47 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.4.4-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> 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 @@ <parent> <artifactId>dcaegen2-sdk-moher-api</artifactId> <groupId>org.onap.dcaegen2.services.sdk</groupId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-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 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 @@ <parent> <artifactId>dcaegen2-sdk-moher-api</artifactId> <groupId>org.onap.dcaegen2.services.sdk</groupId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> </parent> <name>Monitoring and Healthcheck :: Metrics</name> 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 @@ <parent> <artifactId>dcaegen2-services-sdk-standardization</artifactId> <groupId>org.onap.dcaegen2.services.sdk</groupId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-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 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 @@ <parent> <artifactId>dcaegen2-sdk-moher-api</artifactId> <groupId>org.onap.dcaegen2.services.sdk</groupId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-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 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 @@ <parent> <artifactId>dcaegen2-sdk-moher-server-adapters</artifactId> <groupId>org.onap.dcaegen2.services.sdk</groupId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-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 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 @@ <parent> <artifactId>dcaegen2-sdk-moher-server-adapters</artifactId> <groupId>org.onap.dcaegen2.services.sdk</groupId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> </parent> <name>Monitoring and Healthcheck :: Server Adapters :: Spring Webflux</name> 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 @@ <parent> <groupId>org.onap.dcaegen2.services</groupId> <artifactId>sdk</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> 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 |