Skip to content

Commit 9c48b68

Browse files
artur-ciocanuartur-ciocanu
authored
Merge branch 'master' into 1386-http-endpoint-from-workflow
2 parents 3922b66 + c466d1b commit 9c48b68

File tree

14 files changed

+269
-67
lines changed

14 files changed

+269
-67
lines changed

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,20 @@
1818
<dependency>
1919
<groupId>io.dapr.spring</groupId>
2020
<artifactId>dapr-spring-data</artifactId>
21-
<version>${project.parent.version}</version>
2221
<optional>true</optional>
2322
</dependency>
23+
<dependency>
24+
<groupId>io.dapr</groupId>
25+
<artifactId>dapr-sdk-actors</artifactId>
26+
</dependency>
2427
<dependency>
2528
<groupId>io.dapr.spring</groupId>
2629
<artifactId>dapr-spring-messaging</artifactId>
27-
<version>${project.parent.version}</version>
2830
<optional>true</optional>
2931
</dependency>
3032
<dependency>
3133
<groupId>io.dapr.spring</groupId>
3234
<artifactId>dapr-spring-workflows</artifactId>
33-
<version>${project.parent.version}</version>
3435
<optional>true</optional>
3536
</dependency>
3637
<dependency>
@@ -71,9 +72,20 @@
7172
<dependency>
7273
<groupId>io.dapr</groupId>
7374
<artifactId>testcontainers-dapr</artifactId>
74-
<version>${dapr.sdk.alpha.version}</version>
7575
<scope>test</scope>
7676
</dependency>
77+
<dependency>
78+
<groupId>org.springframework</groupId>
79+
<artifactId>spring-beans</artifactId>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.springframework</groupId>
83+
<artifactId>spring-context</artifactId>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.springframework.boot</groupId>
87+
<artifactId>spring-boot-starter-test</artifactId>
88+
</dependency>
7789
</dependencies>
7890
<build>
7991
<plugins>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@
2323
<dependency>
2424
<groupId>io.dapr.spring</groupId>
2525
<artifactId>dapr-spring-boot-tests</artifactId>
26-
<version>${project.parent.version}</version>
2726
</dependency>
2827
<dependency>
2928
<groupId>io.dapr</groupId>
3029
<artifactId>testcontainers-dapr</artifactId>
31-
<version>${project.parent.version}</version>
3230
</dependency>
3331
<dependency>
3432
<groupId>org.springframework.boot</groupId>

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,22 @@
2323
<dependency>
2424
<groupId>io.dapr</groupId>
2525
<artifactId>dapr-sdk-springboot</artifactId>
26-
<version>${dapr.sdk.version}</version>
2726
</dependency>
2827
<dependency>
2928
<groupId>io.dapr.spring</groupId>
3029
<artifactId>dapr-spring-boot-autoconfigure</artifactId>
31-
<version>${project.parent.version}</version>
3230
</dependency>
3331
<dependency>
3432
<groupId>io.dapr.spring</groupId>
3533
<artifactId>dapr-spring-data</artifactId>
36-
<version>${project.parent.version}</version>
3734
</dependency>
3835
<dependency>
3936
<groupId>io.dapr.spring</groupId>
4037
<artifactId>dapr-spring-messaging</artifactId>
41-
<version>${project.parent.version}</version>
4238
</dependency>
4339
<dependency>
4440
<groupId>io.dapr.spring</groupId>
4541
<artifactId>dapr-spring-workflows</artifactId>
46-
<version>${project.parent.version}</version>
4742
</dependency>
4843
</dependencies>
4944

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<dependency>
2323
<groupId>io.dapr.spring</groupId>
2424
<artifactId>dapr-spring-boot-autoconfigure</artifactId>
25-
<version>${project.parent.version}</version>
2625
</dependency>
2726
<dependency>
2827
<groupId>org.testcontainers</groupId>
@@ -38,7 +37,6 @@
3837
<dependency>
3938
<groupId>io.dapr</groupId>
4039
<artifactId>testcontainers-dapr</artifactId>
41-
<version>${dapr.sdk.alpha.version}</version>
4240
</dependency>
4341
</dependencies>
4442
<build>

‎dapr-spring/dapr-spring-data/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
<groupId>org.springframework.data</groupId>
2020
<artifactId>spring-data-keyvalue</artifactId>
2121
</dependency>
22+
<dependency>
23+
<groupId>io.dapr</groupId>
24+
<artifactId>dapr-sdk</artifactId>
25+
</dependency>
2226
</dependencies>
2327

2428
<build>

‎dapr-spring/dapr-spring-messaging/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,17 @@
1414
<description>Dapr Spring Messaging</description>
1515
<packaging>jar</packaging>
1616

17+
<dependencies>
18+
<dependency>
19+
<groupId>org.springframework</groupId>
20+
<artifactId>spring-context</artifactId>
21+
</dependency>
22+
<dependency>
23+
<groupId>io.dapr</groupId>
24+
<artifactId>dapr-sdk</artifactId>
25+
</dependency>
26+
</dependencies>
27+
1728
<build>
1829
<plugins>
1930
<plugin>

‎dapr-spring/dapr-spring-workflows/pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,17 @@
1515
<packaging>jar</packaging>
1616

1717
<dependencies>
18+
<dependency>
19+
<groupId>org.springframework</groupId>
20+
<artifactId>spring-beans</artifactId>
21+
</dependency>
22+
<dependency>
23+
<groupId>org.springframework</groupId>
24+
<artifactId>spring-context</artifactId>
25+
</dependency>
1826
<dependency>
1927
<groupId>io.dapr</groupId>
2028
<artifactId>dapr-sdk-workflows</artifactId>
21-
<version>${project.version}</version>
2229
</dependency>
2330
</dependencies>
2431
<build>

‎dapr-spring/pom.xml

Lines changed: 94 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@
2828
</modules>
2929

3030
<properties>
31-
<springboot.version>3.2.6</springboot.version>
3231
<maven.compiler.source>11</maven.compiler.source>
3332
<maven.compiler.target>11</maven.compiler.target>
3433
<maven.compiler.release>11</maven.compiler.release>
3534
<testcontainers.version>1.19.8</testcontainers.version>
36-
<junit.version>5.10.2</junit.version>
35+
<junit.version>5.11.2</junit.version>
36+
<dapr.spring.version>0.16.0-SNAPSHOT</dapr.spring.version>
37+
<springboot.version>3.2.6</springboot.version>
38+
<springframework.version>6.1.8</springframework.version>
3739
<logback-core.version>1.4.14</logback-core.version>
3840
</properties>
3941

@@ -44,32 +46,121 @@
4446
<artifactId>spring-boot-dependencies</artifactId>
4547
<version>${springboot.version}</version>
4648
<type>pom</type>
47-
<scope>import</scope>
4849
</dependency>
50+
<dependency>
51+
<groupId>io.dapr</groupId>
52+
<artifactId>dapr-sdk</artifactId>
53+
<version>${dapr.sdk.version}</version>
54+
</dependency>
55+
<dependency>
56+
<groupId>io.dapr</groupId>
57+
<artifactId>dapr-sdk-actors</artifactId>
58+
<version>${dapr.sdk.version}</version>
59+
</dependency>
60+
<dependency>
61+
<groupId>io.dapr</groupId>
62+
<artifactId>dapr-sdk-workflows</artifactId>
63+
<version>${dapr.sdk.alpha.version}</version>
64+
</dependency>
65+
<dependency>
66+
<groupId>io.dapr.spring</groupId>
67+
<artifactId>dapr-spring-data</artifactId>
68+
<version>${dapr.spring.version}</version>
69+
</dependency>
70+
<dependency>
71+
<groupId>io.dapr.spring</groupId>
72+
<artifactId>dapr-spring-messaging</artifactId>
73+
<version>${dapr.spring.version}</version>
74+
</dependency>
75+
<dependency>
76+
<groupId>io.dapr.spring</groupId>
77+
<artifactId>dapr-spring-workflows</artifactId>
78+
<version>${dapr.spring.version}</version>
79+
</dependency>
80+
<dependency>
81+
<groupId>io.dapr.spring</groupId>
82+
<artifactId>dapr-spring-boot-autoconfigure</artifactId>
83+
<version>${dapr.spring.version}</version>
84+
</dependency>
85+
<dependency>
86+
<groupId>io.dapr</groupId>
87+
<artifactId>dapr-sdk-springboot</artifactId>
88+
<version>${dapr.sdk.version}</version>
89+
</dependency>
90+
<dependency>
91+
<groupId>org.springframework</groupId>
92+
<artifactId>spring-context</artifactId>
93+
<version>${springframework.version}</version>
94+
</dependency>
95+
<dependency>
96+
<groupId>org.springframework</groupId>
97+
<artifactId>spring-beans</artifactId>
98+
<version>${springframework.version}</version>
99+
</dependency>
100+
101+
<!-- Spring dependencies -->
102+
<dependency>
103+
<groupId>org.springframework</groupId>
104+
<artifactId>spring-web</artifactId>
105+
<version>${springframework.version}</version>
106+
</dependency>
107+
<dependency>
108+
<groupId>org.springframework.boot</groupId>
109+
<artifactId>spring-boot-configuration-processor</artifactId>
110+
<version>${springboot.version}</version>
111+
</dependency>
112+
<dependency>
113+
<groupId>org.springframework.boot</groupId>
114+
<artifactId>spring-boot-starter</artifactId>
115+
<version>${springboot.version}</version>
116+
</dependency>
117+
<dependency>
118+
<groupId>org.springframework.boot</groupId>
119+
<artifactId>spring-boot-autoconfigure-processor</artifactId>
120+
<version>${springboot.version}</version>
121+
</dependency>
122+
<dependency>
123+
<groupId>io.dapr.spring</groupId>
124+
<artifactId>dapr-spring-boot-tests</artifactId>
125+
<version>${dapr.spring.version}</version>
126+
</dependency>
127+
128+
<!-- Test dependencies -->
49129
<dependency>
50130
<groupId>org.junit.jupiter</groupId>
51131
<artifactId>junit-jupiter-api</artifactId>
52132
<version>${junit.version}</version>
133+
<scope>test</scope>
134+
</dependency>
135+
<dependency>
136+
<groupId>org.springframework.boot</groupId>
137+
<artifactId>spring-boot-starter-test</artifactId>
138+
<version>${springboot.version}</version>
139+
<scope>test</scope>
53140
</dependency>
54141
<dependency>
55142
<groupId>org.junit.jupiter</groupId>
56143
<artifactId>junit-jupiter-params</artifactId>
57144
<version>${junit.version}</version>
145+
<scope>test</scope>
58146
</dependency>
59147
<dependency>
60148
<groupId>org.junit.jupiter</groupId>
61149
<artifactId>junit-jupiter-engine</artifactId>
62150
<version>${junit.version}</version>
151+
<scope>test</scope>
63152
</dependency>
64153
<dependency>
65154
<groupId>org.junit.jupiter</groupId>
66155
<artifactId>junit-jupiter</artifactId>
67156
<version>${junit.version}</version>
157+
<scope>test</scope>
68158
</dependency>
69159
<dependency>
70160
<groupId>org.testcontainers</groupId>
71161
<artifactId>junit-jupiter</artifactId>
72162
<version>${testcontainers.version}</version>
163+
<scope>test</scope>
73164
</dependency>
74165
<dependency>
75166
<groupId>ch.qos.logback</groupId>
@@ -79,46 +170,6 @@
79170
</dependencies>
80171
</dependencyManagement>
81172

82-
<dependencies>
83-
<!-- Dapr dependencies -->
84-
<dependency>
85-
<groupId>io.dapr</groupId>
86-
<artifactId>dapr-sdk</artifactId>
87-
<version>${dapr.sdk.version}</version>
88-
</dependency>
89-
<dependency>
90-
<groupId>io.dapr</groupId>
91-
<artifactId>dapr-sdk-actors</artifactId>
92-
<version>${dapr.sdk.version}</version>
93-
</dependency>
94-
95-
<!-- Spring dependencies -->
96-
<dependency>
97-
<groupId>org.springframework</groupId>
98-
<artifactId>spring-web</artifactId>
99-
<optional>true</optional>
100-
</dependency>
101-
<dependency>
102-
<groupId>org.springframework</groupId>
103-
<artifactId>spring-context</artifactId>
104-
<optional>true</optional>
105-
</dependency>
106-
<dependency>
107-
<groupId>org.springframework.boot</groupId>
108-
<artifactId>spring-boot-configuration-processor</artifactId>
109-
<version>${springboot.version}</version>
110-
<optional>true</optional>
111-
</dependency>
112-
113-
<!-- Test dependencies -->
114-
<dependency>
115-
<groupId>org.springframework.boot</groupId>
116-
<artifactId>spring-boot-starter-test</artifactId>
117-
<version>${springboot.version}</version>
118-
<scope>test</scope>
119-
</dependency>
120-
</dependencies>
121-
122173
<build>
123174
<plugins>
124175
<plugin>

‎daprdocs/content/en/java-sdk-docs/java-ai/_index.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
type: docs
3+
title: "AI"
4+
linkTitle: "AI"
5+
weight: 3000
6+
description: With the Dapr Conversation AI package, you can interact with the Dapr AI workloads from a Java application. To get started, walk through the [Dapr AI]({{< ref java-ai-howto.md >}}) how-to guide.
7+
---

0 commit comments

Comments
 (0)