Skip to content

Commit 8e4d2ab

Browse files
FameingFameing
committed
Create backport all changes from master
1 parent a590a86 commit 8e4d2ab

File tree

494 files changed

+2994
-2620
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

494 files changed

+2994
-2620
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ jobs:
4040
distribution: 'zulu'
4141
java-version: '11'
4242
- name: Build with Maven
43-
run: ./mvnw -version && whoami && umask -S && umask a+rw && umask -S && ./mvnw clean verify -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.count=3 --no-snapshot-updates --batch-mode --no-transfer-progress
43+
run: ./mvnw -version && whoami && umask -S && umask a+rw && umask -S && ./mvnw clean verify -P docker-clean -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.count=3 --no-snapshot-updates --batch-mode --no-transfer-progress

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
1818
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

‎README.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ embedded.postgresql.mountVolumes:
213213
----
214214

215215
|embedded.{module-name}.capabilities
216-
| empty list. `NET_ADMIN` is set for Aerospike, Couchbase, Elasticsearch, Kafka, Mariadb, Memsql, Minio, Mongodb, Mysql, Neo4j, Redis containers. NOTE: `NET_ADMIN` is needed for the `NetworkTestOperations` to work.
216+
| empty list. `NET_ADMIN` is set for Aerospike, Couchbase, Elasticsearch, Kafka, Mariadb, Memsql, Minio, Mongodb, Mysql, Neo4j.
217217
|The Linux capabilities that should be enabled. You can disable all capabilities by providing empty value for this property.
218218
See: https://man7.org/linux/man-pages/man7/capabilities.7.html.
219219
Available values can be taken from `com.github.dockerjava.api.model.Capability` class.

‎embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/AerospikeEnterpriseConfigurer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.playtika.testcontainers.aerospike.enterprise;
22

3-
import com.playtika.test.aerospike.AerospikeProperties;
3+
import com.playtika.testcontainer.aerospike.AerospikeProperties;
44
import lombok.RequiredArgsConstructor;
55
import lombok.extern.slf4j.Slf4j;
66
import org.testcontainers.containers.GenericContainer;

‎embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/EnterpriseAerospikeTestOperationsAutoConfiguration.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.playtika.testcontainers.aerospike.enterprise;
22

33
import com.aerospike.client.AerospikeClient;
4-
import com.playtika.test.aerospike.AerospikeExpiredDocumentsCleaner;
5-
import com.playtika.test.aerospike.AerospikeProperties;
6-
import com.playtika.test.aerospike.EmbeddedAerospikeTestOperationsAutoConfiguration;
7-
import com.playtika.test.aerospike.ExpiredDocumentsCleaner;
4+
import com.playtika.testcontainer.aerospike.AerospikeExpiredDocumentsCleaner;
5+
import com.playtika.testcontainer.aerospike.AerospikeProperties;
6+
import com.playtika.testcontainer.aerospike.EmbeddedAerospikeTestOperationsAutoConfiguration;
7+
import com.playtika.testcontainer.aerospike.ExpiredDocumentsCleaner;
88
import org.springframework.boot.autoconfigure.AutoConfiguration;
99
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
1010
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;

‎embedded-aerospike-enterprise/src/main/java/com/playtika/testcontainers/aerospike/enterprise/SetupEnterpriseAerospikeBootstrapConfiguration.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.playtika.testcontainers.aerospike.enterprise;
22

3-
import com.playtika.test.aerospike.AerospikeProperties;
4-
import com.playtika.test.aerospike.EmbeddedAerospikeBootstrapConfiguration;
3+
import com.playtika.testcontainer.aerospike.AerospikeProperties;
4+
import com.playtika.testcontainer.aerospike.EmbeddedAerospikeBootstrapConfiguration;
55
import lombok.extern.slf4j.Slf4j;
66
import org.springframework.beans.factory.annotation.Autowired;
77
import org.springframework.beans.factory.annotation.Qualifier;
@@ -41,7 +41,7 @@ public void setEnvironment(Environment environment) {
4141
}
4242

4343
@Autowired
44-
@Qualifier(AerospikeProperties.AEROSPIKE_BEAN_NAME)
44+
@Qualifier(AerospikeProperties.BEAN_NAME_AEROSPIKE)
4545
public void setAerospikeContainer(GenericContainer<?> aerospikeContainer) {
4646
this.aerospikeContainer = aerospikeContainer;
4747
}

‎embedded-aerospike-enterprise/src/test/java/com/playtika/testcontainers/aerospike/enterprise/AsadmCommandExecutorTest.java‎

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

3-
import com.playtika.test.aerospike.AerospikeProperties;
3+
import com.playtika.testcontainer.aerospike.AerospikeProperties;
44
import org.junit.jupiter.api.Test;
55
import org.springframework.beans.factory.annotation.Autowired;
66
import org.springframework.beans.factory.annotation.Qualifier;
@@ -11,7 +11,7 @@
1111
public class AsadmCommandExecutorTest extends BaseEnterpriseAerospikeTest {
1212

1313
@Autowired
14-
@Qualifier(AerospikeProperties.AEROSPIKE_BEAN_NAME)
14+
@Qualifier(AerospikeProperties.BEAN_NAME_AEROSPIKE)
1515
private GenericContainer<?> aerospikeContainer;
1616

1717
@Test

‎embedded-aerospike-enterprise/src/test/java/com/playtika/testcontainers/aerospike/enterprise/BaseEnterpriseAerospikeTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.aerospike.client.AerospikeClient;
44
import com.aerospike.client.policy.ClientPolicy;
55
import com.aerospike.client.policy.WritePolicy;
6-
import com.playtika.test.aerospike.AerospikeTestOperations;
6+
import com.playtika.testcontainer.aerospike.AerospikeTestOperations;
77
import org.springframework.beans.factory.annotation.Autowired;
88
import org.springframework.beans.factory.annotation.Value;
99
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;

‎embedded-aerospike/pom.xml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,18 @@
1414
<artifactId>embedded-aerospike</artifactId>
1515

1616
<properties>
17-
<aerospike-client.version>6.1.7</aerospike-client.version>
18-
<joda-time.version>2.12.2</joda-time.version>
17+
<aerospike-client.version>6.1.11</aerospike-client.version>
1918
</properties>
2019

2120
<dependencies>
21+
<dependency>
22+
<groupId>com.playtika.testcontainers</groupId>
23+
<artifactId>testcontainers-common</artifactId>
24+
</dependency>
25+
<dependency>
26+
<groupId>com.playtika.testcontainers</groupId>
27+
<artifactId>embedded-toxiproxy</artifactId>
28+
</dependency>
2229
<!--
2330
aerospike client is provided since we want users to pick own version,
2431
and not rely on test library
@@ -29,22 +36,9 @@
2936
<version>${aerospike-client.version}</version>
3037
<scope>provided</scope>
3138
</dependency>
32-
<dependency>
33-
<groupId>com.playtika.testcontainers</groupId>
34-
<artifactId>testcontainers-common</artifactId>
35-
</dependency>
36-
<dependency>
37-
<groupId>joda-time</groupId>
38-
<artifactId>joda-time</artifactId>
39-
<version>${joda-time.version}</version>
40-
</dependency>
4139
<dependency>
4240
<groupId>org.assertj</groupId>
4341
<artifactId>assertj-core</artifactId>
4442
</dependency>
45-
<dependency>
46-
<groupId>com.playtika.testcontainers</groupId>
47-
<artifactId>embedded-toxiproxy</artifactId>
48-
</dependency>
4943
</dependencies>
5044
</project>

‎embedded-aerospike/src/main/java/com/playtika/test/aerospike/AerospikeExpiredDocumentsCleaner.java‎ renamed to ‎embedded-aerospike/src/main/java/com/playtika/testcontainer/aerospike/AerospikeExpiredDocumentsCleaner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.playtika.test.aerospike;
1+
package com.playtika.testcontainer.aerospike;
22

33
import com.aerospike.client.AerospikeClient;
44
import com.aerospike.client.Language;

0 commit comments

Comments
 (0)