diff --git a/modules/siddhi-core/src/main/java/io/siddhi/core/util/config/YAMLConfigManager.java b/modules/siddhi-core/src/main/java/io/siddhi/core/util/config/YAMLConfigManager.java
index 2e953d6e00..f2aeadaa0d 100644
--- a/modules/siddhi-core/src/main/java/io/siddhi/core/util/config/YAMLConfigManager.java
+++ b/modules/siddhi-core/src/main/java/io/siddhi/core/util/config/YAMLConfigManager.java
@@ -26,6 +26,7 @@
import io.siddhi.core.util.config.model.RootConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.CustomClassLoaderConstructor;
import org.yaml.snakeyaml.introspector.BeanAccess;
@@ -53,15 +54,15 @@ public YAMLConfigManager(String yamlContent) {
*/
private void init(String yamlContent) throws YAMLConfigManagerException {
try {
- CustomClassLoaderConstructor constructor = new CustomClassLoaderConstructor(
- RootConfiguration.class, RootConfiguration.class.getClassLoader());
+ CustomClassLoaderConstructor constructor =
+ new CustomClassLoaderConstructor(RootConfiguration.class.getClassLoader(), new LoaderOptions());
PropertyUtils propertyUtils = new PropertyUtils();
propertyUtils.setSkipMissingProperties(true);
constructor.setPropertyUtils(propertyUtils);
Yaml yaml = new Yaml(constructor);
yaml.setBeanAccess(BeanAccess.FIELD);
- this.rootConfiguration = yaml.load(yamlContent);
+ this.rootConfiguration = yaml.loadAs(yamlContent, RootConfiguration.class);
} catch (Exception e) {
throw new YAMLConfigManagerException("Unable to parse YAML string, '" + yamlContent + "'.", e);
}
diff --git a/modules/siddhi-core/src/test/java/io/siddhi/core/stream/FaultStreamTestCase.java b/modules/siddhi-core/src/test/java/io/siddhi/core/stream/FaultStreamTestCase.java
index 6162c8a45e..4b954f5969 100644
--- a/modules/siddhi-core/src/test/java/io/siddhi/core/stream/FaultStreamTestCase.java
+++ b/modules/siddhi-core/src/test/java/io/siddhi/core/stream/FaultStreamTestCase.java
@@ -513,7 +513,7 @@ public void faultStreamTest9() throws InterruptedException {
"@OnError(action='stream')" +
"define stream cseEventStream (symbol string, price float, volume long);" +
"\n" +
- "@sink(type='inMemory', topic='{{symbol}}', on.error='stream', @map(type='passThrough')) " +
+ "@sink(type='inMemory', topic='sample', on.error='stream', @map(type='passThrough')) " +
"define stream outputStream (symbol string, price float, sym1 string);" +
"\n" +
"@info(name = 'query1') " +
@@ -548,7 +548,7 @@ public void run() {
Thread.sleep(500);
AssertJUnit.assertTrue(((UnitTestAppender) logger.getAppenders().
get("UnitTestAppender")).getMessages().contains("after consuming events from Stream " +
- "'outputStream', Subscriber for topic 'IBM' is unavailable. Hence, dropping event"));
+ "'outputStream', Subscriber for topic 'sample' is unavailable. Hence, dropping event"));
} catch (Exception e) {
Assert.fail("Unexpected exception occurred when testing.", e);
} finally {
diff --git a/modules/siddhi-feature/pom.xml b/modules/siddhi-feature/pom.xml
index 3a01bd90e3..d26acb49c9 100644
--- a/modules/siddhi-feature/pom.xml
+++ b/modules/siddhi-feature/pom.xml
@@ -200,7 +200,7 @@
${slf4j.version}
- org.apache.logging.log4j.slf4j-impl
+ org.apache.logging.log4j.slf4j.impl
${log4j.version}
diff --git a/pom.xml b/pom.xml
index b74e11d42c..cd0a5a7387 100644
--- a/pom.xml
+++ b/pom.xml
@@ -796,20 +796,20 @@
[3.0.0, 4.0.0)
- [23.0.0, 32.0.0)
+ [23.0.0, 34.0.0)
[2.0.0, 3.0.0)
4.0.2
7.1.0
- 2.17.1
+ 2.22.1
[2.0, 3.0)
- 1.7.35
+ 2.0.11
2.4.5.Final
4.11.1
3.4.2.wso2v1
- 31.1-jre
- 31.1.0.jre
- 2.9.1
+ 33.0.0-jre
+ 33.0.0.jre
+ 2.10.1
3.9
3.9
2.3.2
@@ -824,13 +824,13 @@
2.8.1
3.2.1
2.5
- 2.13.1
+ 2.16.0
3.6.3
3.6.3
3.6.0
2.3.29
- 1.3.2
- 1.30
+ 2.15.1
+ 2.2
0.8.5
findbugs-exclude.xml
checkstyle-suppressions.xml