Skip to content

Commit

Permalink
Dependency version bump #168
Browse files Browse the repository at this point in the history
  • Loading branch information
mp911de committed Dec 22, 2015
1 parent f4b07f6 commit 0a2a6f3
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 18 deletions.
25 changes: 13 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -9,7 +10,7 @@

<groupId>biz.paluch.redis</groupId>
<artifactId>lettuce</artifactId>
<version>4.1.Final-SNAPSHOT</version>
<version>4.1-SNAPSHOT</version>
<packaging>jar</packaging>

<name>lettuce</name>
Expand Down Expand Up @@ -56,7 +57,7 @@
<skipTests>true</skipTests>
<github.site.upload.skip>true</github.site.upload.skip>
<lettuce-release-version>3.3.1.Final</lettuce-release-version>
<netty-version>4.0.30.Final</netty-version>
<netty-version>4.0.33.Final</netty-version>
</properties>

<scm>
Expand All @@ -75,7 +76,7 @@
<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxjava</artifactId>
<version>1.0.14</version>
<version>1.1.0</version>
</dependency>

<!-- Netty -->
Expand Down Expand Up @@ -121,22 +122,22 @@
<dependency>
<groupId>org.latencyutils</groupId>
<artifactId>LatencyUtils</artifactId>
<version>2.0.2</version>
<version>2.0.3</version>
</dependency>

<!-- Spring/CDI -->

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>4.2.0.RELEASE</version>
<version>4.2.4.RELEASE</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.2.0.RELEASE</version>
<version>4.2.4.RELEASE</version>
<scope>provided</scope>
</dependency>

Expand All @@ -157,7 +158,7 @@
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -202,7 +203,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<scope>test</scope>
</dependency>

Expand All @@ -216,14 +217,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.2.0.RELEASE</version>
<version>4.2.4.RELEASE</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>4.2.0.RELEASE</version>
<version>4.2.4.RELEASE</version>
<scope>test</scope>
</dependency>

Expand All @@ -237,7 +238,7 @@
<dependency>
<groupId>com.github.javaparser</groupId>
<artifactId>javaparser-core</artifactId>
<version>2.2.1</version>
<version>2.3.0</version>
<scope>test</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/lambdaworks/redis/ClientOptionsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import static com.lambdaworks.Connections.getConnectionWatchdog;
import static com.lambdaworks.Connections.getStatefulConnection;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
import static org.assertj.core.api.StrictAssertions.assertThat;

import org.junit.Test;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;

import static org.assertj.core.api.StrictAssertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

/**
* @author <a href="mailto:[email protected]">Mark Paluch</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import static com.lambdaworks.redis.ScriptOutputType.STATUS;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.StrictAssertions.fail;
import static org.assertj.core.api.Fail.fail;

import java.util.*;
import java.util.concurrent.TimeUnit;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
package com.lambdaworks.redis.commands;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.StrictAssertions.assertThat;

import java.util.List;
import java.util.concurrent.TimeUnit;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

import com.lambdaworks.redis.*;
import com.lambdaworks.redis.models.role.RedisNodeDescription;
import org.assertj.core.api.StrictAssertions;
import org.assertj.core.util.Lists;
import org.junit.After;
import org.junit.Before;
Expand Down Expand Up @@ -79,7 +78,7 @@ public void testConnectionCount() throws Exception {

MasterSlaveConnectionProvider connectionProvider = getConnectionProvider();

StrictAssertions.assertThat(connectionProvider.getConnectionCount()).isEqualTo(1);
assertThat(connectionProvider.getConnectionCount()).isEqualTo(1);
slaveCall(connection);

assertThat(connectionProvider.getConnectionCount()).isEqualTo(2);
Expand Down

0 comments on commit 0a2a6f3

Please sign in to comment.