Skip to content

Commit 65b38c6

Browse files
lukas-krecanlukas-krecan
authored
Merge pull request lukas-krecan#66 from lukas-krecan/upgrade
Upgrading dependencies and removing deprecated stuff
2 parents b7915f7 + 94100c0 commit 65b38c6

File tree

15 files changed

+15
-376
lines changed

15 files changed

+15
-376
lines changed

‎pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@
3434
<module>providers/hazelcast/shedlock-provider-hazelcast</module>
3535
<module>providers/redis/shedlock-provider-redis-jedis</module>
3636
<module>providers/redis/shedlock-provider-redis-spring</module>
37-
<module>providers/redis/shedlock-provider-jedis</module>
3837
</modules>
3938

4039
<properties>
41-
<spring.version>4.3.4.RELEASE</spring.version>
40+
<spring.version>5.0.6.RELEASE</spring.version>
4241
</properties>
4342

4443
<dependencies>
@@ -81,21 +80,21 @@
8180
<dependency>
8281
<groupId>org.mockito</groupId>
8382
<artifactId>mockito-core</artifactId>
84-
<version>2.10.0</version>
83+
<version>2.18.3</version>
8584
<scope>test</scope>
8685
</dependency>
8786

8887
<dependency>
8988
<groupId>org.awaitility</groupId>
9089
<artifactId>awaitility</artifactId>
91-
<version>3.0.0</version>
90+
<version>3.1.0</version>
9291
<scope>test</scope>
9392
</dependency>
9493

9594
<dependency>
9695
<groupId>org.assertj</groupId>
9796
<artifactId>assertj-core</artifactId>
98-
<version>3.8.0</version>
97+
<version>3.10.0</version>
9998
<scope>test</scope>
10099
</dependency>
101100
</dependencies>

‎providers/hazelcast/shedlock-provider-hazelcast/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<version>0.18.3-SNAPSHOT</version>
1212

1313
<properties>
14-
<hazelcast.version>3.8.3</hazelcast.version>
14+
<hazelcast.version>3.10.1</hazelcast.version>
1515
</properties>
1616

1717
<dependencies>

‎providers/mongo/shedlock-provider-mongo/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
<dependency>
2121
<groupId>org.mongodb</groupId>
2222
<artifactId>mongo-java-driver</artifactId>
23-
<version>3.4.0</version>
23+
<version>3.5.0</version>
2424
</dependency>
2525

2626
<dependency>
2727
<groupId>de.flapdoodle.embed</groupId>
2828
<artifactId>de.flapdoodle.embed.mongo</artifactId>
29-
<version>2.0.0</version>
29+
<version>2.0.3</version>
3030
<scope>test</scope>
3131
</dependency>
3232

‎providers/redis/shedlock-provider-jedis/pom.xml

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎providers/redis/shedlock-provider-jedis/src/main/java/net/javacrumbs/shedlock/provider/jedis/JedisLockProvider.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎providers/redis/shedlock-provider-jedis/src/test/java/net/javacrumbs/shedlock/provider/jedis/JedisLockProviderIntegrationTest.java

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎providers/redis/shedlock-provider-jedis/src/test/resources/logback.xml

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎providers/redis/shedlock-provider-redis-spring/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>org.springframework.data</groupId>
2222
<artifactId>spring-data-redis</artifactId>
23-
<version>1.8.10.RELEASE</version>
23+
<version>2.0.6.RELEASE</version>
2424
</dependency>
2525

2626
<dependency>
@@ -45,9 +45,9 @@
4545
</dependency>
4646

4747
<dependency>
48-
<groupId>biz.paluch.redis</groupId>
49-
<artifactId>lettuce</artifactId>
50-
<version>4.2.2.Final</version>
48+
<groupId>io.lettuce</groupId>
49+
<artifactId>lettuce-core</artifactId>
50+
<version>5.0.3.RELEASE</version>
5151
<scope>test</scope>
5252
</dependency>
5353
</dependencies>

‎providers/redis/shedlock-provider-redis-spring/src/main/java/net/javacrumbs/shedlock/provider/redis/spring/RedisLockProvider.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,12 @@ public RedisLockProvider(RedisConnectionFactory redisConn, String environment) {
5353

5454
@Override
5555
public Optional<SimpleLock> lock(LockConfiguration lockConfiguration) {
56-
5756
String key = buildKey(lockConfiguration.getName(), this.environment);
5857
RedisConnection redisConnection = null;
5958
try {
6059
redisConnection = redisConnectionFactory.getConnection();
61-
if (redisConnection.setNX(key.getBytes(), buildValue())) {
62-
redisConnection.pExpire(key.getBytes(), getMsUntil(lockConfiguration.getLockAtMostUntil()));
60+
Expiration expiration = getExpiration(lockConfiguration.getLockAtMostUntil());
61+
if (redisConnection.set(key.getBytes(), buildValue(), expiration, SetOption.SET_IF_ABSENT)) {
6362
return Optional.of(new RedisLock(key, redisConnectionFactory, lockConfiguration));
6463
} else {
6564
return Optional.empty();

‎providers/zookeeper/shedlock-provider-zookeeper-curator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<version>0.18.3-SNAPSHOT</version>
1212

1313
<properties>
14-
<curator.version>3.2.1</curator.version>
14+
<curator.version>4.0.1</curator.version>
1515
</properties>
1616

1717
<dependencies>

0 commit comments

Comments
 (0)