Skip to content

Commit 6188159

Browse files
jruauxjruaux
committed
[deps] Renamed Redis Labs to Redis
1 parent 3abeb78 commit 6188159

26 files changed

+63
-58
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
group=com.redislabs.testcontainers
2-
redislabsBuildVersion=0.1.0
2+
redisBuildVersion=0.1.0
33
kordampPluginVersion=0.46.0

‎jreleaser.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ project:
1515

1616
release:
1717
github:
18-
branch: master
1918
username: jruaux
2019
overwrite: true
2120
changelog:
@@ -58,3 +57,5 @@ release:
5857
files:
5958
artifacts:
6059
- path: VERSION
60+
- path: subprojects/testcontainers-redis/build/distributions/testcontainers-redis-{{projectVersion}}.zip
61+
transform: testcontainers-redis-{{projectEffectiveVersion}}.zip

‎settings.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ buildscript {
66
}
77
dependencies {
88
classpath "org.kordamp.gradle:java-project-gradle-plugin:$kordampPluginVersion"
9-
classpath "com.redislabs.gradle:redislabs-parentbuild:$redislabsBuildVersion"
9+
classpath "com.redis.gradle:redis-parentbuild:$redisBuildVersion"
1010
}
1111
}
1212

13-
apply plugin: 'com.redislabs.gradle.redislabs-parentbuild'
13+
apply plugin: 'com.redis.gradle.redis-parentbuild'
1414

1515
rootProject.name = 'testcontainers-redis'
1616

subprojects/testcontainers-redis/src/main/java/com/redislabs/testcontainers/RedisClusterContainer.java renamed to subprojects/testcontainers-redis/src/main/java/com/redis/testcontainers/RedisClusterContainer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.redislabs.testcontainers;
1+
package com.redis.testcontainers;
22

33
import org.testcontainers.containers.GenericContainer;
44
import org.testcontainers.containers.wait.strategy.Wait;
@@ -85,7 +85,7 @@ public RedisClusterContainer withMasters(int count) {
8585
if (count <= 0) {
8686
throw new IllegalArgumentException("Count must be greater than zero");
8787
}
88-
this.masters = masters;
88+
this.masters = count;
8989
return update();
9090
}
9191

subprojects/testcontainers-redis/src/main/java/com/redislabs/testcontainers/RedisContainer.java renamed to subprojects/testcontainers-redis/src/main/java/com/redis/testcontainers/RedisContainer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.redislabs.testcontainers;
1+
package com.redis.testcontainers;
22

3-
import com.redislabs.testcontainers.support.AbstractRedisContainer;
3+
import com.redis.testcontainers.support.AbstractRedisContainer;
44
import org.testcontainers.utility.DockerImageName;
55
import org.testcontainers.utility.MountableFile;
66

subprojects/testcontainers-redis/src/main/java/com/redislabs/testcontainers/RedisEnterpriseContainer.java renamed to subprojects/testcontainers-redis/src/main/java/com/redis/testcontainers/RedisEnterpriseContainer.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
package com.redislabs.testcontainers;
1+
package com.redis.testcontainers;
22

33
import com.github.dockerjava.api.DockerClient;
44
import com.github.dockerjava.api.command.ExecCreateCmdResponse;
55
import com.github.dockerjava.api.command.InspectContainerResponse;
66
import com.github.dockerjava.api.exception.DockerException;
77
import com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
8-
import com.redislabs.testcontainers.support.RetryCallable;
9-
import com.redislabs.testcontainers.support.enterprise.DatabaseProvisioner;
10-
import com.redislabs.testcontainers.support.enterprise.RestAPI;
11-
import com.redislabs.testcontainers.support.enterprise.rest.Bootstrap;
12-
import com.redislabs.testcontainers.support.enterprise.rest.Database;
13-
import com.redislabs.testcontainers.support.enterprise.rest.DatabaseCreateResponse;
8+
import com.redis.testcontainers.support.RetryCallable;
9+
import com.redis.testcontainers.support.enterprise.DatabaseProvisioner;
10+
import com.redis.testcontainers.support.enterprise.RestAPI;
11+
import com.redis.testcontainers.support.enterprise.rest.Bootstrap;
12+
import com.redis.testcontainers.support.enterprise.rest.Database;
13+
import com.redis.testcontainers.support.enterprise.rest.DatabaseCreateResponse;
1414
import lombok.AccessLevel;
1515
import lombok.AllArgsConstructor;
1616
import lombok.SneakyThrows;
@@ -25,7 +25,6 @@
2525
import org.testcontainers.containers.wait.strategy.Wait;
2626
import org.testcontainers.shaded.org.apache.commons.lang.ClassUtils;
2727
import org.testcontainers.utility.DockerImageName;
28-
import org.testcontainers.utility.MountableFile;
2928
import org.testcontainers.utility.TestEnvironment;
3029

3130
import java.io.IOException;
@@ -43,8 +42,8 @@ public class RedisEnterpriseContainer extends GenericContainer<RedisEnterpriseCo
4342
public static final String MODULE_SEARCH = "search";
4443
public static final String MODULE_TIMESERIES = "timeseries";
4544

46-
public static final String ADMIN_USERNAME = "testcontainers@redislabs.com";
47-
public static final String ADMIN_PASSWORD = "redislabs123";
45+
public static final String ADMIN_USERNAME = "testcontainers@redis.com";
46+
public static final String ADMIN_PASSWORD = "redis123";
4847
public static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("redislabs/redis");
4948
private static final String NODE_EXTERNAL_ADDR = "0.0.0.0";
5049
private static final int DEFAULT_SHARD_COUNT = 2;

subprojects/testcontainers-redis/src/main/java/com/redislabs/testcontainers/RedisModulesContainer.java renamed to subprojects/testcontainers-redis/src/main/java/com/redis/testcontainers/RedisModulesContainer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.redislabs.testcontainers;
1+
package com.redis.testcontainers;
22

3-
import com.redislabs.testcontainers.support.AbstractRedisContainer;
3+
import com.redis.testcontainers.support.AbstractRedisContainer;
44
import org.testcontainers.utility.DockerImageName;
55

66
public class RedisModulesContainer extends AbstractRedisContainer<RedisModulesContainer> {

subprojects/testcontainers-redis/src/main/java/com/redislabs/testcontainers/RedisServer.java renamed to subprojects/testcontainers-redis/src/main/java/com/redis/testcontainers/RedisServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.redislabs.testcontainers;
1+
package com.redis.testcontainers;
22

33
import org.testcontainers.containers.GenericContainer;
44

subprojects/testcontainers-redis/src/main/java/com/redislabs/testcontainers/support/AbstractRedisContainer.java renamed to subprojects/testcontainers-redis/src/main/java/com/redis/testcontainers/support/AbstractRedisContainer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.redislabs.testcontainers.support;
1+
package com.redis.testcontainers.support;
22

3-
import com.redislabs.testcontainers.RedisServer;
3+
import com.redis.testcontainers.RedisServer;
44
import org.testcontainers.containers.GenericContainer;
55
import org.testcontainers.containers.wait.strategy.Wait;
66
import org.testcontainers.shaded.org.apache.commons.lang.ClassUtils;

subprojects/testcontainers-redis/src/main/java/com/redislabs/testcontainers/support/RetryCallable.java renamed to subprojects/testcontainers-redis/src/main/java/com/redis/testcontainers/support/RetryCallable.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.redislabs.testcontainers.support;
1+
package com.redis.testcontainers.support;
22

33
import java.time.Duration;
44
import java.util.concurrent.Callable;
@@ -46,6 +46,7 @@ public RetryCallable<T> timeout(Duration timeout) {
4646
}
4747
}
4848

49+
@SuppressWarnings("BusyWait")
4950
@Override
5051
public T call() throws Exception {
5152
Exception lastException;

0 commit comments

Comments
 (0)