Compare commits

..

13 Commits

Author SHA1 Message Date
Jon Chambers
52cac449aa [maven-release-plugin] prepare for next development iteration
Some checks failed
Service CI / build (macos-latest) (push) Has been cancelled
Service CI / build (ubuntu-latest) (push) Has been cancelled
2024-10-21 11:08:34 -04:00
Jon Chambers
7515aa3653 [maven-release-plugin] prepare release 0.9.1
Some checks failed
Service CI / build (macos-latest) (push) Has been cancelled
Service CI / build (ubuntu-latest) (push) Has been cancelled
2024-10-21 11:08:31 -04:00
Chris Eager
1058eb0d03 Throw EmbeddedRedisException if server fails to start 2024-10-18 15:45:48 -05:00
Jon Chambers
596e1e4f55 Update to commons-io 2.17.0 2024-10-07 12:27:56 -04:00
Jon Chambers
ce50da9193 Update version in dependency snippet in README 2024-03-29 11:49:45 -04:00
Jon Chambers
d766a33570 [maven-release-plugin] prepare for next development iteration 2024-03-29 11:46:32 -04:00
Jon Chambers
9ebccb7ad8 [maven-release-plugin] prepare release 0.9.0
Some checks failed
Service CI / build (ubuntu-latest) (push) Has been cancelled
Service CI / build (macos-latest) (push) Has been cancelled
2024-03-29 11:46:30 -04:00
Chris Eager
8145f151d6 Update Maven plugins 2024-03-26 15:00:42 -05:00
Chris Eager
4e0f1416c3 Update actions/checkout and actions/setup-java to 4.x 2024-02-29 11:45:02 -06:00
Chris Eager
48820c03a4 Update README.md for 0.9.0 2024-02-27 09:51:29 -06:00
Chris Eager
06b2938e6b Update binaries to Redis 7.0.15 2024-02-27 09:51:29 -06:00
Chris Eager
2beaab3fab Update various dependencies 2024-02-27 09:51:29 -06:00
Chris Eager
e22d710cec Update next release to 0.9.0 2024-02-27 09:51:29 -06:00
4 changed files with 18 additions and 18 deletions

View File

@ -12,9 +12,9 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Set up JDK 11
uses: actions/setup-java@v2
uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
with:
java-version: 11
distribution: 'temurin'

View File

@ -15,7 +15,7 @@ Maven Central:
<dependency>
<groupId>org.signal</groupId>
<artifactId>embedded-redis</artifactId>
<version>0.8.3</version>
<version>0.9.0</version>
</dependency>
```

20
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>org.signal</groupId>
<artifactId>embedded-redis</artifactId>
<packaging>jar</packaging>
<version>0.9.0-SNAPSHOT</version>
<version>0.9.2-SNAPSHOT</version>
<name>embedded-redis</name>
<description>Redis embedded server for Java integration testing.</description>
<url>https://github.com/signalapp/embedded-redis</url>
@ -21,7 +21,7 @@
<url>https://github.com/signalapp/embedded-redis</url>
<connection>scm:git:https://github.com/signalapp/embedded-redis.git</connection>
<developerConnection>scm:git:git@github.com:signalapp/embedded-redis.git</developerConnection>
<tag>HEAD</tag>
<tag>0.9.1</tag>
</scm>
<developers>
@ -45,7 +45,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
<version>2.17.0</version>
</dependency>
<!-- TEST DEPENDENCIES -->
@ -89,13 +89,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.13.0</version>
<configuration>
<source>8</source>
<target>8</target>
@ -105,7 +105,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<executions>
<execution>
<id>attach-sources</id>
@ -118,7 +118,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.6.3</version>
<configuration>
<source>8</source>
</configuration>
@ -134,7 +134,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.2.2</version>
<executions>
<execution>
<id>sign-artifacts</id>
@ -159,7 +159,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
<executions>
<execution>
<id>copy-test-certs</id>
@ -180,7 +180,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.2.0</version>
<executions>
<execution>
<id>generate-test-certificates</id>

View File

@ -63,16 +63,16 @@ abstract class AbstractRedisInstance implements Redis {
private void awaitRedisServerReady() throws IOException {
BufferedReader reader = new BufferedReader(new InputStreamReader(redisProcess.getInputStream()));
try {
StringBuffer outputStringBuffer = new StringBuffer();
StringBuilder outputStringBuilder = new StringBuilder();
String outputLine;
do {
outputLine = reader.readLine();
if (outputLine == null) {
//Something goes wrong. Stream is ended before server was activated.
throw new RuntimeException("Can't start redis server. Check logs for details. Redis process log: " + outputStringBuffer.toString());
// Something is wrong. Stream ended before server was activated.
throw new EmbeddedRedisException("Redis server failed to become ready. Check logs for details. Redis process log: " + outputStringBuilder.toString());
} else {
outputStringBuffer.append("\n");
outputStringBuffer.append(outputLine);
outputStringBuilder.append("\n");
outputStringBuilder.append(outputLine);
}
} while (!outputLine.matches(redisReadyPattern()));
} finally {