Skip to content

Commit ed07c49

Browse files
authored
Merge branch 'develop' into dependabot/github_actions/develop/codecov/codecov-action-4
2 parents b503f69 + a87b44f commit ed07c49

File tree

11 files changed

+24
-11
lines changed

11 files changed

+24
-11
lines changed

.github/workflows/release-support-stream.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,19 @@ on:
1212
branch:
1313
description: "Branch to be released"
1414
required: true
15-
type: string
15+
default: 'support/2.3.X'
16+
type: choice
17+
options:
18+
- 'support/2.3.X'
19+
- 'support/3.0.X'
20+
java-version:
21+
description: "Java version"
22+
required: true
23+
default: '21'
24+
type: choice
25+
options:
26+
- '21'
27+
- '17'
1628

1729
jobs:
1830
publish:
@@ -28,7 +40,7 @@ jobs:
2840
uses: actions/setup-java@v4
2941
with:
3042
distribution: 'corretto'
31-
java-version: '21'
43+
java-version: ${{github.event.inputs.java-version}}
3244
server-id: ossrh
3345
server-username: MAVEN_USERNAME
3446
server-password: MAVEN_PASSWORD

embedded-couchbase/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<artifactId>embedded-couchbase</artifactId>
1515

1616
<properties>
17-
<couchbase-java-client-3.x.version>3.5.2</couchbase-java-client-3.x.version>
17+
<couchbase-java-client-3.x.version>3.5.3</couchbase-java-client-3.x.version>
1818
<okhttp.version>4.12.0</okhttp.version>
1919
</properties>
2020

embedded-keycloak/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<artifactId>embedded-keycloak</artifactId>
1414

1515
<properties>
16-
<keycloak.version>23.0.5</keycloak.version>
16+
<keycloak.version>23.0.6</keycloak.version>
1717
</properties>
1818

1919
<dependencies>

embedded-memsql/src/main/java/com/playtika/testcontainer/memsql/EmbeddedMemSqlBootstrapConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public GenericContainer<?> memsql(ConfigurableEnvironment environment,
6969
Optional<Network> network) {
7070
GenericContainer<?> memsql = new GenericContainer<>(ContainerUtils.getDockerImageName(properties))
7171
.withEnv("IGNORE_MIN_REQUIREMENTS", "1")
72+
.withEnv("SINGLESTORE_SET_GLOBAL_DEFAULT_PARTITIONS_PER_LEAF", "1")
7273
.withEnv("LICENSE_KEY", properties.getLicenseKey())
7374
.withEnv("SINGLESTORE_LICENSE", properties.getLicenseKey())
7475
.withEnv("ROOT_PASSWORD", properties.getPassword())

embedded-minio/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<artifactId>embedded-minio</artifactId>
1414

1515
<properties>
16-
<minio.version>8.5.7</minio.version>
16+
<minio.version>8.5.8</minio.version>
1717
<!-- Manage an OkHttp version supported by MinIO -->
1818
<okhttp.version>4.12.0</okhttp.version>
1919
</properties>

embedded-mssqlserver/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<artifactId>embedded-mssqlserver</artifactId>
1515

1616
<properties>
17-
<mssql-jdbc.version>12.5.0.jre11-preview</mssql-jdbc.version>
17+
<mssql-jdbc.version>12.6.0.jre11</mssql-jdbc.version>
1818
</properties>
1919

2020
<dependencies>

embedded-nats/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<artifactId>embedded-nats</artifactId>
1414

1515
<properties>
16-
<jnats.version>2.17.2</jnats.version>
16+
<jnats.version>2.17.3</jnats.version>
1717
</properties>
1818

1919
<dependencies>

embedded-neo4j/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<artifactId>embedded-neo4j</artifactId>
1414

1515
<properties>
16-
<neo4j-java-driver.version>5.16.0</neo4j-java-driver.version>
16+
<neo4j-java-driver.version>5.17.0</neo4j-java-driver.version>
1717
</properties>
1818

1919
<dependencies>

embedded-pulsar/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<artifactId>embedded-pulsar</artifactId>
1515

1616
<properties>
17-
<pulsar-clients.version>3.1.2</pulsar-clients.version>
17+
<pulsar-clients.version>3.2.0</pulsar-clients.version>
1818
</properties>
1919

2020
<dependencies>

embedded-spicedb/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<artifactId>embedded-spicedb</artifactId>
1414

1515
<properties>
16-
<grpc-protobuf.version>1.61.0</grpc-protobuf.version>
16+
<grpc-protobuf.version>1.61.1</grpc-protobuf.version>
1717
<authzed.version>0.6.0</authzed.version>
1818
</properties>
1919

0 commit comments

Comments
 (0)