diff --git a/README.md b/README.md index c63ef9bd..41e6d202 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Redis embedded server for Java integration testing Fork Notes ============== -This repository is a fork of https://github.com/ozimov/embedded-redis, which is in turn a fork of https://github.com/kstyrc/embedded-redis. We've updated the embedded Redis binaries to version 6.2.7 so we can write tests that use recent Redis features without imposing dependencies that are not well-encapsulated by a single Maven/Gradle build. +This repository is a fork of https://github.com/ozimov/embedded-redis, which is in turn a fork of https://github.com/kstyrc/embedded-redis. We've updated the embedded Redis binaries to version 7.0.15 so we can write tests that use recent Redis features without imposing dependencies that are not well-encapsulated by a single Maven/Gradle build. Maven dependency ============== @@ -142,10 +142,10 @@ Redis version By default, RedisServer runs an OS-specific executable enclosed in in the `embedded-redis` jar. The jar includes: -- Redis 6.2.7 for Linux/Unix (i386, x86_64 and arm64) -- Redis 6.2.7 for macOS (x86_64 and arm64e AKA Apple Silicon) +- Redis 7.0.15 for Linux/Unix (i386, x86_64 and arm64) +- Redis 7.0.15 for macOS (x86_64 and arm64e AKA Apple Silicon) -The enclosed binaries are built from source from the [`6.2.7` tag](https://github.com/redis/redis/releases/tag/6.2.7) in the official Redis repository. The Linux and Darwin/macOS binaries are statically-linked amd64 and x86 executables built using the [build-server-binaries.sh](src/main/docker/build-server-binaries.sh) script included in this repository at `/src/main/docker`. Windows binaries are not included because Windows is not officially supported by Redis. +The enclosed binaries are built from source from the [`7.0.15` tag](https://github.com/redis/redis/releases/tag/7.0.15) in the official Redis repository. The Linux and Darwin/macOS binaries are statically-linked amd64 and x86 executables built using the [build-server-binaries.sh](src/main/docker/build-server-binaries.sh) script included in this repository at `/src/main/docker`. Windows binaries are not included because Windows is not officially supported by Redis. Note: the `build-server-binaries.sh` script attempts to build all of the above noted OS and architectures, which means that it expects the local Docker daemon to support all of them. Docker Desktop on macOS and Windows supports multi-arch builds out of the box; Docker on Linux may require [additional configuration](https://docs.docker.com/buildx/working-with-buildx/). diff --git a/src/main/docker/build-server-binaries.sh b/src/main/docker/build-server-binaries.sh index 4ef9597b..ccbd2230 100755 --- a/src/main/docker/build-server-binaries.sh +++ b/src/main/docker/build-server-binaries.sh @@ -2,7 +2,7 @@ set -e -REDIS_VERSION=6.2.7 +REDIS_VERSION=7.0.15 REDIS_TARBALL="redis-${REDIS_VERSION}.tar.gz" REDIS_URL="https://download.redis.io/releases/${REDIS_TARBALL}" diff --git a/src/main/java/redis/embedded/RedisExecProvider.java b/src/main/java/redis/embedded/RedisExecProvider.java index 3e77b025..8f9d8d41 100644 --- a/src/main/java/redis/embedded/RedisExecProvider.java +++ b/src/main/java/redis/embedded/RedisExecProvider.java @@ -15,7 +15,7 @@ public class RedisExecProvider { private final Map executables = Maps.newHashMap(); - public static final String redisVersion = "6.2.7"; + public static final String redisVersion = "7.0.15"; public static RedisExecProvider defaultProvider() { return new RedisExecProvider(); diff --git a/src/main/resources/redis-server-6.2.7-darwin-amd64 b/src/main/resources/redis-server-6.2.7-darwin-amd64 deleted file mode 100644 index 66fedd80..00000000 Binary files a/src/main/resources/redis-server-6.2.7-darwin-amd64 and /dev/null differ diff --git a/src/main/resources/redis-server-6.2.7-darwin-arm64 b/src/main/resources/redis-server-6.2.7-darwin-arm64 deleted file mode 100644 index 3e73dcd3..00000000 Binary files a/src/main/resources/redis-server-6.2.7-darwin-arm64 and /dev/null differ diff --git a/src/main/resources/redis-server-6.2.7-linux-386 b/src/main/resources/redis-server-6.2.7-linux-386 deleted file mode 100644 index 4a71fa93..00000000 Binary files a/src/main/resources/redis-server-6.2.7-linux-386 and /dev/null differ diff --git a/src/main/resources/redis-server-6.2.7-linux-amd64 b/src/main/resources/redis-server-6.2.7-linux-amd64 deleted file mode 100644 index b0fc6344..00000000 Binary files a/src/main/resources/redis-server-6.2.7-linux-amd64 and /dev/null differ diff --git a/src/main/resources/redis-server-6.2.7-linux-arm64 b/src/main/resources/redis-server-6.2.7-linux-arm64 deleted file mode 100644 index e76397f3..00000000 Binary files a/src/main/resources/redis-server-6.2.7-linux-arm64 and /dev/null differ diff --git a/src/main/resources/redis-server-7.0.15-darwin-amd64 b/src/main/resources/redis-server-7.0.15-darwin-amd64 new file mode 100755 index 00000000..9d4357ec Binary files /dev/null and b/src/main/resources/redis-server-7.0.15-darwin-amd64 differ diff --git a/src/main/resources/redis-server-7.0.15-darwin-arm64 b/src/main/resources/redis-server-7.0.15-darwin-arm64 new file mode 100755 index 00000000..2ff22177 Binary files /dev/null and b/src/main/resources/redis-server-7.0.15-darwin-arm64 differ diff --git a/src/main/resources/redis-server-7.0.15-linux-386 b/src/main/resources/redis-server-7.0.15-linux-386 new file mode 100755 index 00000000..089c8b03 Binary files /dev/null and b/src/main/resources/redis-server-7.0.15-linux-386 differ diff --git a/src/main/resources/redis-server-7.0.15-linux-amd64 b/src/main/resources/redis-server-7.0.15-linux-amd64 new file mode 100755 index 00000000..36177f20 Binary files /dev/null and b/src/main/resources/redis-server-7.0.15-linux-amd64 differ diff --git a/src/main/resources/redis-server-7.0.15-linux-arm64 b/src/main/resources/redis-server-7.0.15-linux-arm64 new file mode 100755 index 00000000..cb424574 Binary files /dev/null and b/src/main/resources/redis-server-7.0.15-linux-arm64 differ