Skip to content

Commit e6aac88

Browse files
authored
Upgrade optional module dependencies' minor/patch versions (#905)
1 parent f7ff863 commit e6aac88

File tree

7 files changed

+13
-12
lines changed

7 files changed

+13
-12
lines changed

bolt-http4k/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111

1212
<properties>
13-
<http4k.version>4.17.2.0</http4k.version>
13+
<http4k.version>4.17.3.0</http4k.version>
1414
</properties>
1515

1616
<artifactId>bolt-http4k</artifactId>

bolt-jetty/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111

1212
<properties>
13-
<jetty.version>9.4.43.v20210629</jetty.version>
13+
<jetty.version>9.4.44.v20210927</jetty.version>
1414
</properties>
1515

1616
<artifactId>bolt-jetty</artifactId>

bolt-micronaut/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
</parent>
1111

1212
<properties>
13-
<micronaut.version>3.2.2</micronaut.version>
13+
<micronaut.version>3.2.3</micronaut.version>
1414
<micronaut-test-junit5.version>3.0.5</micronaut-test-junit5.version>
1515
<micronaut-rxjava3.version>2.1.1</micronaut-rxjava3.version>
1616
<!-- Note that upgrading this library breaks other dependency resolution -->
1717
<mockito-all.version>1.10.19</mockito-all.version>
18-
<jakarta.inject.version>2.0.1</jakarta.inject.version>
18+
<jakarta.inject.version>2.0.1.MR</jakarta.inject.version>
1919
</properties>
2020

2121
<artifactId>bolt-micronaut</artifactId>

docs/_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ okhttpVersion: 4.9.3
1111
slf4jApiVersion: 1.7.32
1212
kotlinVersion: 1.6.0
1313
springBootVersion: 2.6.1
14+
# TODO: 3.x when releasing bolt-micronaut 1.16
1415
compatibleMicronautVersion: 2.x
1516
quarkusVersion: 1.9.2.Final
1617
helidonVersion: 2.3.2

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
4848
<okhttp.version>4.9.3</okhttp.version>
4949
<gson.version>2.8.9</gson.version>
50-
<kotlin.version>1.6.0</kotlin.version>
50+
<kotlin.version>1.6.10</kotlin.version>
5151
<slf4j.version>1.7.32</slf4j.version>
5252
<lombok.version>1.18.22</lombok.version>
5353
<lombok-maven-plugin.version>1.18.20.0</lombok-maven-plugin.version>
@@ -56,9 +56,9 @@
5656
<!-- optional / testing-only dependencies -->
5757
<aws.s3.version>[1.12.62,1.13.0)</aws.s3.version>
5858
<junit.version>4.13.2</junit.version>
59-
<logback.version>1.2.7</logback.version>
59+
<logback.version>1.2.8</logback.version>
6060
<hamcrest.version>[1.3,2.0)</hamcrest.version>
61-
<mockito-core.version>[3.12.4,3.13.0)</mockito-core.version>
61+
<mockito-core.version>[4.1.0,5.0.0)</mockito-core.version>
6262
<jetty-for-tests.version>9.2.27.v20190403</jetty-for-tests.version>
6363

6464
<!-- Maven plugins: range versioning does not work -->

slack-api-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<!-- TODO upgrade to 2.0 in the next major version -->
1919
<tyrus-standalone-client.version>1.17</tyrus-standalone-client.version>
2020
<java-websocket.version>1.5.2</java-websocket.version>
21-
<jedis.version>3.7.0</jedis.version>
21+
<jedis.version>3.7.1</jedis.version>
2222
<jedis-mock.version>0.1.23</jedis-mock.version>
2323
</properties>
2424

slack-api-client/src/main/java/com/slack/api/rate_limits/metrics/impl/BaseRedisMetricsDatastore.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public void incrementFailedCalls(String executorName, String teamId, String meth
167167
public void updateCurrentQueueSize(String executorName, String teamId, String methodName) {
168168
try (Jedis jedis = jedis()) {
169169
String key = toWaitingMessageIdsKey(jedis, executorName, teamId, methodName);
170-
Integer totalSize = jedis.llen(key).intValue();
170+
Integer totalSize = Math.toIntExact(jedis.llen(key));
171171
RateLimitQueue<SUPPLIER, MSG> queue = getRateLimitQueue(executorName, teamId);
172172
if (queue != null) {
173173
totalSize += queue.getCurrentActiveQueueSize(methodName);
@@ -194,15 +194,15 @@ public void updateNumberOfLastMinuteRequests(String executorName, String teamId,
194194
jedis.lrem(key, 1, str);
195195
}
196196
}
197-
setNumberOfLastMinuteRequests(executorName, teamId, methodName, jedis.llen(key).intValue());
197+
setNumberOfLastMinuteRequests(executorName, teamId, methodName, Math.toIntExact(jedis.llen(key)));
198198
}
199199
}
200200

201201
@Override
202202
public Integer getNumberOfLastMinuteRequests(String executorName, String teamId, String methodName) {
203203
try (Jedis jedis = jedis()) {
204204
String key = toLastMinuteRequestsKey(jedis, executorName, teamId, methodName);
205-
return jedis.llen(key).intValue();
205+
return Math.toIntExact(jedis.llen(key));
206206
}
207207
}
208208

@@ -235,7 +235,7 @@ public void addToLastMinuteRequests(String executorName, String teamId, String m
235235
try (Jedis jedis = jedis()) {
236236
String key = toLastMinuteRequestsKey(jedis, executorName, teamId, methodName);
237237
jedis.rpush(key, String.valueOf(currentMillis));
238-
setNumberOfLastMinuteRequests(executorName, teamId, methodName, jedis.llen(key).intValue());
238+
setNumberOfLastMinuteRequests(executorName, teamId, methodName, Math.toIntExact(jedis.llen(key)));
239239
}
240240
}
241241

0 commit comments

Comments
 (0)