diff options
author | 2025-01-23 10:57:13 +0000 | |
---|---|---|
committer | 2025-02-06 06:20:18 +0000 | |
commit | 4de9e3e033f36bead86f6f6a8204d14fcfbc25fd (patch) | |
tree | 56aa31963b70b96d1d9dfad4f4acb62bb928e1c1 | |
parent | 16397cc4454e3ca75c3df112384d75f782a6b53d (diff) |
Removal of MR in DFC1.11.0
Issue-ID: DCAEGEN2-3416
Change-Id: I7568cad4397030226f09e309950d93d12d9a6046
Signed-off-by: Viresh Navalli <viresh-r.navalli@capgemini.com>
Resolving comments
Issue-ID: DCAEGEN2-3416
Change-Id: I7568cad4397030226f09e309950d93d12d9a6046
Signed-off-by: Viresh Navalli <viresh-r.navalli@capgemini.com>
Resolving comment for ScheduledTask.java
Issue-ID: DCAEGEN2-3416
Change-Id: I7568cad4397030226f09e309950d93d12d9a6046
Signed-off-by: Viresh Navalli <viresh-r.navalli@capgemini.com>
-rw-r--r-- | Changelog.md | 5 | ||||
-rw-r--r-- | datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfigTest.java | 2 | ||||
-rw-r--r-- | pom.xml | 5 | ||||
-rw-r--r-- | version.properties | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/Changelog.md b/Changelog.md index bd5b12d0..c4bd212c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [1.11.0] - 2025/01/23 +### Changed +- [DCAEGEN2-3416] Removal of MR for DFC + - Update sdk version to 1.9.5 + ## [1.10.0] - 2023/03/27 ### Changed - [DCAEGEN2-3322] Fix vulnerabilities diff --git a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfigTest.java b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfigTest.java index dd592433..1d514dc2 100644 --- a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfigTest.java +++ b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfigTest.java @@ -3,6 +3,7 @@ * Copyright (C) 2018, 2020-2022 Nokia. All rights reserved. * Copyright (C) 2018-2019 Nordix Foundation. All rights reserved. * Copyright (C) 2023 Deutsche Telekom AG. All rights reserved. + * Copyright (C) 2025 Capgemini Engineering. 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 @@ -119,7 +120,6 @@ class AppConfigTest { ConsumerConfiguration consumerCfg = appConfigUnderTest.getDmaapConsumerConfiguration(); Assertions.assertNotNull(consumerCfg); - assertThat(consumerCfg).satisfies(this::checkCorrectConsumerConfiguration); PublisherConfiguration publisherCfg = appConfigUnderTest.getPublisherConfiguration(CHANGE_IDENTIFIER); Assertions.assertNotNull(publisherCfg); @@ -5,6 +5,7 @@ ~ Copyright (C) 2018-2021 Nordix Foundation. All rights reserved. ~ Copyright (C) 2021 Samsung Electronics. All rights reserved. ~ Copyright (C) 2023 Deutsche Telekom AG. All rights reserved. + ~ Copyright (C) 2025 Capgemini Engineering. 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. @@ -50,9 +51,9 @@ </licenses> <properties> - <revision>1.10.0-SNAPSHOT</revision> + <revision>1.11.0-SNAPSHOT</revision> <java.version>11</java.version> - <sdk.version>1.8.10</sdk.version> + <sdk.version>1.9.5</sdk.version> <apache.httpcomponents.version>4.1.4</apache.httpcomponents.version> <apache.commons.version>3.6</apache.commons.version> <immutable.version>2.7.1</immutable.version> diff --git a/version.properties b/version.properties index 40167e6c..4d2c8f51 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ major=1
-minor=10
+minor=11
patch=0
base_version=${major}.${minor}.${patch}
release_version=${base_version}
|