Skip to content

Commit 219fd47

Browse files
authored
Merge pull request #110 from datorama/vulnerabilities-fix
Vulnerabilities fixes
2 parents 24d1dd1 + d81872f commit 219fd47

File tree

5 files changed

+29
-13
lines changed

5 files changed

+29
-13
lines changed

timbermill-java/timbermill-api/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<properties>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
<java.source-target.version>1.8</java.source-target.version>
19-
<timbermill.version>2.4.3</timbermill.version>
19+
<timbermill.version>2.4.4</timbermill.version>
2020
<slf4jVersion>1.7.28</slf4jVersion>
2121
</properties>
2222

@@ -51,12 +51,12 @@
5151
<dependency>
5252
<groupId>com.fasterxml.jackson.core</groupId>
5353
<artifactId>jackson-databind</artifactId>
54-
<version>2.10.5.1</version>
54+
<version>2.13.2.2</version>
5555
</dependency>
5656
<dependency>
5757
<groupId>com.google.code.gson</groupId>
5858
<artifactId>gson</artifactId>
59-
<version>2.8.5</version>
59+
<version>2.9.0</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>javax.validation</groupId>
@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>com.google.guava</groupId>
6868
<artifactId>guava</artifactId>
69-
<version>27.1-jre</version>
69+
<version>31.1-jre</version>
7070
</dependency>
7171
<dependency>
7272
<groupId>org.apache.commons</groupId>

timbermill-java/timbermill-client/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<java.source-target.version>1.8</java.source-target.version>
18-
<timbermill.version>2.4.3</timbermill.version>
18+
<timbermill.version>2.4.4</timbermill.version>
1919
<aspectj.version>1.9.6</aspectj.version>
20-
<org.springframework.version>5.3.4</org.springframework.version>
20+
<org.springframework.version>5.3.18</org.springframework.version>
2121
</properties>
2222

2323
<licenses>

timbermill-java/timbermill-local/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<properties>
1616
<java.source-target.version>1.8</java.source-target.version>
17-
<timbermill.version>2.4.3</timbermill.version>
17+
<timbermill.version>2.4.4</timbermill.version>
1818
<kamon.bundle.version>2.0.4</kamon.bundle.version>
1919
</properties>
2020

@@ -83,7 +83,7 @@
8383
<dependency>
8484
<groupId>com.amazonaws</groupId>
8585
<artifactId>aws-java-sdk-core</artifactId>
86-
<version>1.11.965</version>
86+
<version>1.12.190</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>org.xerial</groupId>

timbermill-java/timbermill-local/src/main/java/com/datorama/oss/timbermill/pipe/LocalOutputPipe.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public static class Builder {
221221
private int fetchByIdsPartitions = 10000;
222222
private int expiredMaxIndicesToDeleteInParallel = 2;
223223
private String timbermillVersion = "";
224-
private int limitForPeriod = 10000;
224+
private int limitForPeriod = 30000;
225225
private Duration limitRefreshPeriodMinutes = Duration.ofMinutes(1);
226226
private int rateLimiterCapacity = 30000;
227227

timbermill-java/timbermill-server/pom.xml

+20-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.3.3.RELEASE</version>
8+
<version>2.6.6</version>
9+
<relativePath></relativePath>
910
</parent>
1011
<modelVersion>4.0.0</modelVersion>
1112

@@ -16,7 +17,7 @@
1617
<properties>
1718
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1819
<java.source-target.version>1.8</java.source-target.version>
19-
<timbermill.version>2.4.3</timbermill.version>
20+
<timbermill.version>2.4.4</timbermill.version>
2021
<slf4jVersion>1.7.28</slf4jVersion>
2122
</properties>
2223

@@ -44,7 +45,7 @@
4445
<dependency>
4546
<groupId>org.springframework.cloud</groupId>
4647
<artifactId>spring-cloud-starter-config</artifactId>
47-
<version>2.2.1.RELEASE</version>
48+
<version>2.2.8.RELEASE</version>
4849
</dependency>
4950
<dependency>
5051
<groupId>com.datorama.oss</groupId>
@@ -54,7 +55,7 @@
5455
<dependency>
5556
<groupId>commons-io</groupId>
5657
<artifactId>commons-io</artifactId>
57-
<version>2.6</version>
58+
<version>2.11.0</version>
5859
</dependency>
5960
<dependency>
6061
<groupId>junit</groupId>
@@ -77,6 +78,21 @@
7778

7879
</dependencies>
7980

81+
<dependencyManagement>
82+
<dependencies>
83+
<dependency>
84+
<groupId>org.elasticsearch.client</groupId>
85+
<artifactId>elasticsearch-rest-high-level-client</artifactId>
86+
<version>7.8.1</version>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.elasticsearch</groupId>
90+
<artifactId>elasticsearch</artifactId>
91+
<version>7.8.1</version>
92+
</dependency>
93+
</dependencies>
94+
</dependencyManagement>
95+
8096
<build>
8197
<pluginManagement>
8298
<plugins>

0 commit comments

Comments
 (0)