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

Update redis binaries #16

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update redis binaries #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
language: java

dist: trusty
dist: bionic

jdk:
- oraclejdk8
- openjdk8

install:
true
Expand Down
29 changes: 15 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>21.0</version>
<version>29.0-jre</version>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
<version>2.7</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.21</version>
<version>1.7.30</version>
</dependency>

<dependency>
Expand All @@ -65,7 +65,7 @@
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>2.8.2</version>
<version>3.3.0</version>
<!-- incompatible with 2.9.0 and up: https://github.com/ozimov/embedded-redis/pull/4 -->
<scope>test</scope>
</dependency>
Expand All @@ -86,7 +86,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>1.8.0.RELEASE</version>
<version>2.3.1.RELEASE</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -120,12 +120,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<version>2.22.2</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.9</version>
<version>0.8.5</version>
<executions>
<execution>
<id>default-prepare-agent</id>
Expand Down Expand Up @@ -155,15 +155,15 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.3</version>
<version>2.7</version>
<configuration>
<generateBackupPoms>false</generateBackupPoms>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
<version>1.9.5</version>
<version>1.11.2</version>
<configuration>
<pushChanges>false</pushChanges>
<tag>${project.version}</tag>
Expand All @@ -172,6 +172,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>8</source>
<target>8</target>
Expand All @@ -191,7 +192,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<version>3.2.0</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
Expand All @@ -206,7 +207,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -219,7 +220,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<version>3.2.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -246,7 +247,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand All @@ -264,7 +265,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.3</version>
<version>2.7</version>
<reportSets>
<reportSet>
<reports>
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/redis/embedded/RedisExecProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ private RedisExecProvider() {
}

private void initExecutables() {
executables.put(OsArchitecture.WINDOWS_x86, "redis-server-2.8.19.exe");
executables.put(OsArchitecture.WINDOWS_x86_64, "redis-server-2.8.19.exe");
executables.put(OsArchitecture.WINDOWS_x86, "redis-server-5.0.9.exe");
executables.put(OsArchitecture.WINDOWS_x86_64, "redis-server-5.0.9.exe");

executables.put(OsArchitecture.UNIX_x86, "redis-server-2.8.19-32");
executables.put(OsArchitecture.UNIX_x86_64, "redis-server-2.8.19");
executables.put(OsArchitecture.UNIX_x86, "redis-server-6.0.5-32");
executables.put(OsArchitecture.UNIX_x86_64, "redis-server-6.0.5");

executables.put(OsArchitecture.MAC_OS_X_x86, "redis-server-2.8.19.app");
executables.put(OsArchitecture.MAC_OS_X_x86_64, "redis-server-2.8.19.app");
executables.put(OsArchitecture.MAC_OS_X_x86, "redis-server-6.0.5.app");
executables.put(OsArchitecture.MAC_OS_X_x86_64, "redis-server-6.0.5.app");
}

public RedisExecProvider override(OS os, String executable) {
Expand Down
Binary file removed src/main/resources/redis-server-2.8.19
View file
Open in desktop
Binary file not shown.
Binary file removed src/main/resources/redis-server-2.8.19-32
View file
Open in desktop
Binary file not shown.
Binary file removed src/main/resources/redis-server-2.8.19.app
View file
Open in desktop
Binary file not shown.
Binary file removed src/main/resources/redis-server-2.8.19.exe
View file
Open in desktop
Binary file not shown.
Binary file added src/main/resources/redis-server-5.0.9.exe
View file
Open in desktop
Binary file not shown.
Binary file added src/main/resources/redis-server-6.0.5
View file
Open in desktop
Binary file not shown.
Binary file added src/main/resources/redis-server-6.0.5-32
View file
Open in desktop
Binary file not shown.
Binary file added src/main/resources/redis-server-6.0.5.app
View file
Open in desktop
Binary file not shown.
22 changes: 11 additions & 11 deletions src/test/java/redis/embedded/RedisClusterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public void testSimpleOperationsAfterRunWithSingleMasterNoSlavesCluster() throws
jedis = testPool(pool);
} finally {
if (jedis != null)
pool.returnResource(jedis);
jedis.close();
cluster.stop();
}
}
Expand All @@ -127,7 +127,7 @@ public void testSimpleOperationsAfterRunWithSingleMasterAndOneSlave() throws Exc
jedis = testPool(pool);
} finally {
if (jedis != null)
pool.returnResource(jedis);
jedis.close();
cluster.stop();
}
}
Expand All @@ -146,7 +146,7 @@ public void testSimpleOperationsAfterRunWithSingleMasterMultipleSlaves() throws
jedis = testPool(pool);
} finally {
if (jedis != null)
pool.returnResource(jedis);
jedis.close();
cluster.stop();
}
}
Expand All @@ -165,7 +165,7 @@ public void testSimpleOperationsAfterRunWithTwoSentinelsSingleMasterMultipleSlav
jedis = testPool(pool);
} finally {
if (jedis != null)
pool.returnResource(jedis);
jedis.close();
cluster.stop();
}
}
Expand All @@ -186,7 +186,7 @@ public void testSimpleOperationsAfterRunWithTwoPredefinedSentinelsSingleMasterMu
jedis = testPool(pool);
} finally {
if (jedis != null)
pool.returnResource(jedis);
jedis.close();
cluster.stop();
}
}
Expand Down Expand Up @@ -220,11 +220,11 @@ public void testSimpleOperationsAfterRunWithThreeSentinelsThreeMastersOneSlavePe
jedis3 = testPool(pool3);
} finally {
if (jedis1 != null)
pool1.returnResource(jedis1);
jedis1.close();
if (jedis2 != null)
pool2.returnResource(jedis2);
jedis2.close();
if (jedis3 != null)
pool3.returnResource(jedis3);
jedis3.close();
cluster.stop();
}
}
Expand Down Expand Up @@ -259,11 +259,11 @@ public void testSimpleOperationsAfterRunWithThreeSentinelsThreeMastersOneSlavePe
jedis3 = testPool(pool3);
} finally {
if (jedis1 != null)
pool1.returnResource(jedis1);
jedis1.close();
if (jedis2 != null)
pool2.returnResource(jedis2);
jedis2.close();
if (jedis3 != null)
pool3.returnResource(jedis3);
jedis3.close();
cluster.stop();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/redis/embedded/RedisSentinelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void testSimpleOperationsAfterRun() throws Exception {
assertNull(jedis.mget("xyz").get(0));
} finally {
if (jedis != null)
pool.returnResource(jedis);
jedis.close();
sentinel.stop();
server.stop();
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/redis/embedded/RedisServerClusterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public void testSimpleOperationsAfterRun() throws Exception {
assertEquals(null, jedis.mget("xyz").get(0));
} finally {
if (jedis != null)
pool.returnResource(jedis);
jedis.close();
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/test/java/redis/embedded/RedisServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void testSimpleOperationsAfterRun() throws Exception {
assertNull(jedis.mget("xyz").get(0));
} finally {
if (jedis != null)
pool.returnResource(jedis);
jedis.close();
redisServer.stop();
}
}
Expand Down Expand Up @@ -97,11 +97,11 @@ public void shouldIndicateInactiveAfterStop() throws Exception {
@Test
public void shouldOverrideDefaultExecutable() throws Exception {
RedisExecProvider customProvider = RedisExecProvider.defaultProvider()
.override(OS.UNIX, Architecture.x86, Resources.getResource("redis-server-2.8.19-32").getFile())
.override(OS.UNIX, Architecture.x86_64, Resources.getResource("redis-server-2.8.19").getFile())
.override(OS.WINDOWS, Architecture.x86, Resources.getResource("redis-server-2.8.19.exe").getFile())
.override(OS.WINDOWS, Architecture.x86_64, Resources.getResource("redis-server-2.8.19.exe").getFile())
.override(OS.MAC_OS_X, Resources.getResource("redis-server-2.8.19").getFile());
.override(OS.UNIX, Architecture.x86, Resources.getResource("redis-server-6.0.5-32").getFile())
.override(OS.UNIX, Architecture.x86_64, Resources.getResource("redis-server-6.0.5").getFile())
.override(OS.WINDOWS, Architecture.x86, Resources.getResource("redis-server-5.0.9.exe").getFile())
.override(OS.WINDOWS, Architecture.x86_64, Resources.getResource("redis-server-5.0.9.exe").getFile())
.override(OS.MAC_OS_X, Resources.getResource("redis-server-6.0.5.app").getFile());

redisServer = new RedisServerBuilder()
.redisExecProvider(customProvider)
Expand Down