Skip to content

Commit 655e804

Browse files
authored
Merge branch 'dapr:master' into master
2 parents a3c1fe7 + 00c1858 commit 655e804

54 files changed

Lines changed: 1051 additions & 258 deletions

File tree

Some content is hidden

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

.github/workflows/validate-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ on:
1717
jobs:
1818
build:
1919
name: "Validate Javadocs generation"
20-
runs-on: linux-arm64-latest-4-cores
21-
timeout-minutes: 30
20+
runs-on: oracle-vm-4cpu-16gb-arm64
21+
timeout-minutes: 60
2222
env:
2323
JDK_VER: 17
2424
steps:

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,7 @@ hs_err_pid*
5151

5252
# macOS
5353
.DS_Store
54+
55+
# Claude Code / OMC
56+
.omc/
57+
.omx/

dapr-spring/dapr-spring-boot-4-autoconfigure/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
</dependency>
111111
<dependency>
112112
<groupId>org.testcontainers</groupId>
113-
<artifactId>junit-jupiter</artifactId>
113+
<artifactId>testcontainers-junit-jupiter</artifactId>
114114
<scope>test</scope>
115115
<exclusions>
116116
<exclusion>

dapr-spring/dapr-spring-boot-properties/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</dependency>
4848
<dependency>
4949
<groupId>org.testcontainers</groupId>
50-
<artifactId>junit-jupiter</artifactId>
50+
<artifactId>testcontainers-junit-jupiter</artifactId>
5151
<scope>test</scope>
5252
<exclusions>
5353
<exclusion>

dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-4-starter-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</dependency>
5151
<dependency>
5252
<groupId>org.testcontainers</groupId>
53-
<artifactId>junit-jupiter</artifactId>
53+
<artifactId>testcontainers-junit-jupiter</artifactId>
5454
<optional>true</optional>
5555
</dependency>
5656
</dependencies>

dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</dependency>
3535
<dependency>
3636
<groupId>org.testcontainers</groupId>
37-
<artifactId>junit-jupiter</artifactId>
37+
<artifactId>testcontainers-junit-jupiter</artifactId>
3838
<optional>true</optional>
3939
</dependency>
4040
</dependencies>

dapr-spring/dapr-spring-boot-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</dependency>
2727
<dependency>
2828
<groupId>org.testcontainers</groupId>
29-
<artifactId>junit-jupiter</artifactId>
29+
<artifactId>testcontainers-junit-jupiter</artifactId>
3030
<scope>test</scope>
3131
<exclusions>
3232
<exclusion>

durabletask-client/src/main/java/io/dapr/durabletask/TaskOrchestrationExecutor.java

Lines changed: 231 additions & 47 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)