dapr
/
java-sdk
mirror of https://github.com/dapr/java-sdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Upgrading to 1.15.7 (#1458)" 

This reverts commit 2d6537ecc2.

Signed-off-by: siri-varma <siri.varma@outlook.com>
This commit is contained in:
salaboy 2025-07-18 15:37:33 +01:00 committed by siri-varma
parent 2963a7fd54
commit 65870fdb43
7 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -39,7 +39,7 @@ jobs:
GOPROXY: https://proxy.golang.org GOPROXY: https://proxy.golang.org
JDK_VER: ${{ matrix.java }} JDK_VER: ${{ matrix.java }}
DAPR_CLI_VER: 1.15.0 DAPR_CLI_VER: 1.15.0
DAPR_RUNTIME_VER: 1.15.7 DAPR_RUNTIME_VER: 1.15.4
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
DAPR_CLI_REF: DAPR_CLI_REF:
DAPR_REF: DAPR_REF:

2
.github/workflows/validate.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
GOPROXY: https://proxy.golang.org GOPROXY: https://proxy.golang.org
JDK_VER: ${{ matrix.java }} JDK_VER: ${{ matrix.java }}
DAPR_CLI_VER: 1.15.0 DAPR_CLI_VER: 1.15.0
DAPR_RUNTIME_VER: 1.15.7 DAPR_RUNTIME_VER: 1.15.4
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
DAPR_CLI_REF: DAPR_CLI_REF:
DAPR_REF: DAPR_REF:

4
daprdocs/content/en/java-sdk-docs/spring-boot/_index.md
View File

@ -80,7 +80,7 @@ public class DaprTestContainersConfig {
@ServiceConnection @ServiceConnection
public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer<?> postgreSQLContainer){ public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer<?> postgreSQLContainer){
return new DaprContainer("daprio/daprd:1.15.7") return new DaprContainer("daprio/daprd:1.15.4")
.withAppName("producer-app") .withAppName("producer-app")
.withNetwork(daprNetwork) .withNetwork(daprNetwork)
.withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES)) .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES))
@ -235,7 +235,7 @@ Finally, because Dapr PubSub requires a bidirectional connection between your ap
@ServiceConnection @ServiceConnection
public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer<?> postgreSQLContainer, RabbitMQContainer rabbitMQContainer){ public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer<?> postgreSQLContainer, RabbitMQContainer rabbitMQContainer){
return new DaprContainer("daprio/daprd:1.15.7") return new DaprContainer("daprio/daprd:1.15.4")
.withAppName("producer-app") .withAppName("producer-app")
.withNetwork(daprNetwork) .withNetwork(daprNetwork)
.withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES)) .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES))

6
pom.xml
View File

@ -17,9 +17,9 @@
<grpc.version>1.69.0</grpc.version> <grpc.version>1.69.0</grpc.version>
<protobuf.version>3.25.5</protobuf.version> <protobuf.version>3.25.5</protobuf.version>
<protocCommand>protoc</protocCommand> <protocCommand>protoc</protocCommand>
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.15.7/dapr/proto</dapr.proto.baseurl> <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.15.4/dapr/proto</dapr.proto.baseurl>
<dapr.sdk.version>1.16.0-SNAPSHOT</dapr.sdk.version> <dapr.sdk.version>1.15.0-rc-8</dapr.sdk.version>
<dapr.sdk.alpha.version>0.16.0-SNAPSHOT</dapr.sdk.alpha.version> <dapr.sdk.alpha.version>0.15.0-rc-8</dapr.sdk.alpha.version>
<os-maven-plugin.version>1.7.1</os-maven-plugin.version> <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version> <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version> <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>

2
spring-boot-examples/kubernetes/README.md
View File

@ -30,7 +30,7 @@ Once you have the cluster up and running you can install Dapr:
helm repo add dapr https://dapr.github.io/helm-charts/ helm repo add dapr https://dapr.github.io/helm-charts/
helm repo update helm repo update
helm upgrade --install dapr dapr/dapr \ helm upgrade --install dapr dapr/dapr \
--version=1.15.7 \ --version=1.15.4 \
--namespace dapr-system \ --namespace dapr-system \
--create-namespace \ --create-namespace \
--wait --wait

2
testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java
View File

@ -1,7 +1,7 @@
package io.dapr.testcontainers; package io.dapr.testcontainers;
public interface DaprContainerConstants { public interface DaprContainerConstants {
String DAPR_VERSION = "1.15.7"; String DAPR_VERSION = "1.15.4";
String DAPR_RUNTIME_IMAGE_TAG = "daprio/daprd:" + DAPR_VERSION; String DAPR_RUNTIME_IMAGE_TAG = "daprio/daprd:" + DAPR_VERSION;
String DAPR_PLACEMENT_IMAGE_TAG = "daprio/placement:" + DAPR_VERSION; String DAPR_PLACEMENT_IMAGE_TAG = "daprio/placement:" + DAPR_VERSION;
String DAPR_SCHEDULER_IMAGE_TAG = "daprio/scheduler:" + DAPR_VERSION; String DAPR_SCHEDULER_IMAGE_TAG = "daprio/scheduler:" + DAPR_VERSION;

21
testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprContainerTest.java
View File

@ -4,7 +4,6 @@ import org.junit.jupiter.api.Test;
import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.DockerImageName;
import static io.dapr.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; import static io.dapr.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG;
import static io.dapr.testcontainers.DaprContainerConstants.DAPR_VERSION;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
public class DaprContainerTest { public class DaprContainerTest {
@ -14,17 +13,17 @@ public class DaprContainerTest {
DaprContainer dapr = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) DaprContainer dapr = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG)
.withAppName("dapr-app") .withAppName("dapr-app")
.withSchedulerImage(DockerImageName.parse("custom/scheduler:" + DAPR_VERSION) .withSchedulerImage(DockerImageName.parse("custom/scheduler:1.15.4")
.asCompatibleSubstituteFor("daprio/scheduler:" + DAPR_VERSION)) .asCompatibleSubstituteFor("daprio/scheduler:1.15.4"))
.withPlacementImage(DockerImageName.parse("custom/placement:"+ DAPR_VERSION) .withPlacementImage(DockerImageName.parse("custom/placement:1.15.4")
.asCompatibleSubstituteFor("daprio/placement:" + DAPR_VERSION)) .asCompatibleSubstituteFor("daprio/placement:1.15.4"))
.withAppPort(8081) .withAppPort(8081)
.withDaprLogLevel(DaprLogLevel.DEBUG) .withDaprLogLevel(DaprLogLevel.DEBUG)
.withAppChannelAddress("host.testcontainers.internal"); .withAppChannelAddress("host.testcontainers.internal");
assertEquals("custom/placement:" + DAPR_VERSION, dapr.getPlacementDockerImageName().asCanonicalNameString()); assertEquals("custom/placement:1.15.4", dapr.getPlacementDockerImageName().asCanonicalNameString());
assertEquals("custom/scheduler:" + DAPR_VERSION, dapr.getSchedulerDockerImageName().asCanonicalNameString()); assertEquals("custom/scheduler:1.15.4", dapr.getSchedulerDockerImageName().asCanonicalNameString());
} }
@ -33,15 +32,15 @@ public class DaprContainerTest {
DaprContainer dapr = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) DaprContainer dapr = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG)
.withAppName("dapr-app") .withAppName("dapr-app")
.withSchedulerImage("daprio/scheduler:" + DAPR_VERSION) .withSchedulerImage("daprio/scheduler:1.15.4")
.withPlacementImage("daprio/placement:"+ DAPR_VERSION) .withPlacementImage("daprio/placement:1.15.4")
.withAppPort(8081) .withAppPort(8081)
.withDaprLogLevel(DaprLogLevel.DEBUG) .withDaprLogLevel(DaprLogLevel.DEBUG)
.withAppChannelAddress("host.testcontainers.internal"); .withAppChannelAddress("host.testcontainers.internal");
assertEquals("daprio/placement:" + DAPR_VERSION, dapr.getPlacementDockerImageName().asCanonicalNameString()); assertEquals("daprio/placement:1.15.4", dapr.getPlacementDockerImageName().asCanonicalNameString());
assertEquals("daprio/scheduler:" + DAPR_VERSION, dapr.getSchedulerDockerImageName().asCanonicalNameString()); assertEquals("daprio/scheduler:1.15.4", dapr.getSchedulerDockerImageName().asCanonicalNameString());
} }
} }