Removal of MR in DFC

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>

diff --git a/Changelog.md b/Changelog.md
index bd5b12d..c4bd212 100644 (file)
--- 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 dd59243..1d514dc 100644 (file)
--- 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);

diff --git a/pom.xml b/pom.xml
index 48f0808..8425b24 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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 40167e6..4d2c8f5 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,5 +1,5 @@
 major=1\r
-minor=10\r
+minor=11\r
 patch=0\r
 base_version=${major}.${minor}.${patch}\r
 release_version=${base_version}\r