Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade 3rd party dependencies #1826

Merged
merged 3 commits into from
Jan 14, 2024
Merged

Upgrade 3rd party dependencies #1826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffef14c
Upgrade 3rd party dependency versions
AnuGayan Jan 13, 2024
c3dbf17
Upgrade 3rd party dependency versions
AnuGayan Jan 13, 2024
d52ec2d
Fix faultStreamTest9 failure
AnuGayan Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions modules/siddhi-core/src/main/java/io/siddhi/core/util/config/YAMLConfigManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions modules/siddhi-core/src/test/java/io/siddhi/core/stream/FaultStreamTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') " +
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion modules/siddhi-feature/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
<version>${slf4j.version}</version>
</bundle>
<bundle>
<symbolicName>org.apache.logging.log4j.slf4j-impl</symbolicName>
<symbolicName>org.apache.logging.log4j.slf4j.impl</symbolicName>
<version>${log4j.version}</version>
</bundle>
<bundle>
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,20 +796,20 @@
<properties>
<!-- version ranges-->
<com.lmax.disruptor.version.range>[3.0.0, 4.0.0)</com.lmax.disruptor.version.range>
<google.guava.version.range>[23.0.0, 32.0.0)</google.guava.version.range>
<google.guava.version.range>[23.0.0, 34.0.0)</google.guava.version.range>
<org.quartz.version.range>[2.0.0, 3.0.0)</org.quartz.version.range>

<awaitility.version>4.0.2</awaitility.version>
<testng.version>7.1.0</testng.version>
<log4j.version>2.17.1</log4j.version>
<log4j.version>2.22.1</log4j.version>
<log4j.imp.pkg.version.range>[2.0, 3.0)</log4j.imp.pkg.version.range>
<slf4j.version>1.7.35</slf4j.version>
<slf4j.version>2.0.11</slf4j.version>
<mvel2.version>2.4.5.Final</mvel2.version>
<antlr.runtime.version>4.11.1</antlr.runtime.version>
<disruptor.version>3.4.2.wso2v1</disruptor.version>
<guava.version>31.1-jre</guava.version>
<guava.bundle.version>31.1.0.jre</guava.bundle.version>
<gson.version>2.9.1</gson.version>
<guava.version>33.0.0-jre</guava.version>
<guava.bundle.version>33.0.0.jre</guava.bundle.version>
<gson.version>2.10.1</gson.version>
<commons-lang3.version>3.9</commons-lang3.version>
<classindex.version>3.9</classindex.version>
<quartz.version>2.3.2</quartz.version>
Expand All @@ -824,13 +824,13 @@
<msf4j.version>2.8.1</msf4j.version>
<maven.shadeplugin.version>3.2.1</maven.shadeplugin.version>
<servlet-api-version>2.5</servlet-api-version>
<jackson-datatype-joda-version>2.13.1</jackson-datatype-joda-version>
<jackson-datatype-joda-version>2.16.0</jackson-datatype-joda-version>
<maven.core.version>3.6.3</maven.core.version>
<maven.plugin.api.version>3.6.3</maven.plugin.api.version>
<maven.plugin.annotations.version>3.6.0</maven.plugin.annotations.version>
<freemarker.version>2.3.29</freemarker.version>
<commons.io.version>1.3.2</commons.io.version>
<snakeyaml.version>1.30</snakeyaml.version>
<commons.io.version>2.15.1</commons.io.version>
<snakeyaml.version>2.2</snakeyaml.version>
<org.jacoco.version>0.8.5</org.jacoco.version>
<mavan.findbugsplugin.exclude.file>findbugs-exclude.xml</mavan.findbugsplugin.exclude.file>
<mavan.checkstyle.suppression.file>checkstyle-suppressions.xml</mavan.checkstyle.suppression.file>
Expand Down