Skip to content

Commit 23ab28f

Browse files
artursouzaartursouza
authored
Merge branch 'master' into actor_ttl
Signed-off-by: Artur Souza <[email protected]>
2 parents 42d4dd4 + 15bbb39 commit 23ab28f

File tree

24 files changed

+1160
-43
lines changed

24 files changed

+1160
-43
lines changed

‎.github/scripts/update_sdk_version.sh

+14-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,23 @@ set -uex
44

55
DAPR_JAVA_SDK_VERSION=$1
66

7-
# The workflows sdk tracks the regular SDK minor and patch versions, just not the major.
8-
# Replaces the workflows SDK major version to 0 until it is stable.
9-
DAPR_JAVA_WORKFLOWS_SDK_VERSION=`echo $DAPR_JAVA_SDK_VERSION | sed 's/^[0-9]*\./0./'`
7+
# Alpha artifacts of the sdk tracks the regular SDK minor and patch versions, just not the major.
8+
# Replaces the SDK major version to 0 for alpha artifacts.
9+
DAPR_JAVA_SDK_ALPHA_VERSION=`echo $DAPR_JAVA_SDK_VERSION | sed 's/^[0-9]*\./0./'`
1010

1111
mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_VERSION
12+
mvn versions:set-property -Dproperty=dapr.sdk.alpha.version -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION
1213
mvn versions:set-property -Dproperty=dapr.sdk.version -DnewVersion=$DAPR_JAVA_SDK_VERSION -f sdk-tests/pom.xml
14+
mvn versions:set-property -Dproperty=dapr.sdk.alpha.version -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f sdk-tests/pom.xml
1315

14-
mvn versions:set -DnewVersion=$DAPR_JAVA_WORKFLOWS_SDK_VERSION -f sdk-workflows/pom.xml
15-
mvn versions:set-property -Dproperty=dapr.sdk-workflows.version -DnewVersion=$DAPR_JAVA_WORKFLOWS_SDK_VERSION
16+
###################
17+
# Alpha artifacts #
18+
###################
19+
20+
# sdk-workflows
21+
mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f sdk-workflows/pom.xml
22+
23+
# testcontainers-dapr
24+
mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f testcontainers-dapr/pom.xml
1625

1726
git clean -f

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
./dist/linux_amd64/release/placement &
100100
- name: Spin local environment
101101
run: |
102-
docker-compose -f ./sdk-tests/deploy/local-test.yml up -d mongo kafka mysql
102+
docker compose -f ./sdk-tests/deploy/local-test.yml up -d mongo kafka mysql
103103
docker ps
104104
- name: Install local ToxiProxy to simulate connectivity issues to Dapr sidecar
105105
run: |

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -237,13 +237,13 @@ Similarly, all of these need to be run for running the ITs either individually o
237237
Run the following commands from the root of the repo to start all the docker containers that the tests depend on.
238238
239239
```bash
240-
docker-compose -f ./sdk-tests/deploy/local-test.yml up -d
240+
docker compose -f ./sdk-tests/deploy/local-test.yml up -d
241241
```
242242
243243
To stop the containers and services, run the following commands.
244244
245245
```bash
246-
docker-compose -f ./sdk-tests/deploy/local-test.yml down
246+
docker compose -f ./sdk-tests/deploy/local-test.yml down
247247
```
248248
249249

‎examples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<dependency>
114114
<groupId>io.dapr</groupId>
115115
<artifactId>dapr-sdk-workflows</artifactId>
116-
<version>${dapr.sdk-workflows.version}</version>
116+
<version>${dapr.sdk.alpha.version}</version>
117117
</dependency>
118118
<dependency>
119119
<groupId>io.dapr</groupId>

‎examples/src/main/java/io/dapr/examples/bindings/http/README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,11 @@ Before getting into the application code, follow these steps in order to set up
5858

5959
<!-- STEP
6060
name: Setup kafka container
61-
expected_stderr_lines:
62-
- 'Creating network "http_default" with the default driver'
6361
sleep: 20
6462
-->
6563

6664
```bash
67-
docker-compose -f ./src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml up -d
65+
docker compose -f ./src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml up -d
6866
```
6967

7068
<!-- END_STEP -->
@@ -248,7 +246,7 @@ name: Cleanup Kafka containers
248246
-->
249247

250248
```bash
251-
docker-compose -f ./src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml down
249+
docker compose -f ./src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml down
252250
```
253251

254252
<!-- END_STEP -->

‎examples/src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '3'
21
services:
32
zookeeper:
43
image: confluentinc/cp-zookeeper:7.4.4

‎examples/src/main/java/io/dapr/examples/querystate/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ sleep: 5
4444
-->
4545

4646
```bash
47-
docker-compose -f ./src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml up -d
47+
docker compose -f ./src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml up -d
4848
```
4949

5050
<!-- END_STEP -->
@@ -305,7 +305,7 @@ name: Cleanup MongoDB containers
305305
-->
306306

307307
```bash
308-
docker-compose -f ./src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml down
308+
docker compose -f ./src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml down
309309
```
310310

311311
<!-- END_STEP -->

‎examples/src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '3'
21
services:
32
mongo:
43
image: mongo

‎examples/src/main/java/io/dapr/examples/state/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ sleep: 5
4444
-->
4545

4646
```bash
47-
docker-compose -f ./src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml up -d
47+
docker compose -f ./src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml up -d
4848
```
4949

5050
<!-- END_STEP -->
@@ -227,7 +227,7 @@ name: Cleanup MongoDB container
227227
-->
228228

229229
```bash
230-
docker-compose -f ./src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml down
230+
docker compose -f ./src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml down
231231
```
232232

233233
<!-- END_STEP -->

‎examples/src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '3'
21
services:
32
mongo:
43
image: mongo

‎pom.xml

+17-23
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@
1717
<grpc.version>1.59.0</grpc.version>
1818
<protobuf.version>3.17.3</protobuf.version>
1919
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.13.0-rc.5/dapr/proto</dapr.proto.baseurl>
20-
<dapr.sdk-workflows.version>0.12.0-SNAPSHOT</dapr.sdk-workflows.version>
20+
<dapr.sdk.alpha.version>0.12.0-SNAPSHOT</dapr.sdk.alpha.version>
2121
<os-maven-plugin.version>1.6.2</os-maven-plugin.version>
2222
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
2323
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
2424
<maven-deploy-plugin.version>2.7</maven-deploy-plugin.version>
25+
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
2526
<maven.compiler.source>11</maven.compiler.source>
2627
<maven.compiler.target>11</maven.compiler.target>
28+
<maven.compiler.release>11</maven.compiler.release>
2729
<maven.deploy.skip>true</maven.deploy.skip>
2830
<!--
2931
manually declare durabletask-client's jackson dependencies for workflows sdk
@@ -38,6 +40,8 @@
3840
<failsafe.version>3.2.2</failsafe.version>
3941
<surefire.version>3.2.2</surefire.version>
4042
<junit-bom.version>5.8.2</junit-bom.version>
43+
<snakeyaml.version>2.0</snakeyaml.version>
44+
<testcontainers.version>1.20.0</testcontainers.version>
4145
</properties>
4246

4347
<distributionManagement>
@@ -112,6 +116,16 @@
112116
<build>
113117
<pluginManagement>
114118
<plugins>
119+
<plugin>
120+
<groupId>org.apache.maven.plugins</groupId>
121+
<artifactId>maven-compiler-plugin</artifactId>
122+
<version>${maven-compiler-plugin.version}</version>
123+
<configuration>
124+
<source>${maven.compiler.source}</source>
125+
<target>${maven.compiler.target}</target>
126+
<release>${maven.compiler.release}</release>
127+
</configuration>
128+
</plugin>
115129
<plugin>
116130
<groupId>org.apache.maven.plugins</groupId>
117131
<artifactId>maven-surefire-plugin</artifactId>
@@ -150,28 +164,6 @@
150164
</execution>
151165
</executions>
152166
</plugin>
153-
<plugin>
154-
<groupId>org.codehaus.mojo</groupId>
155-
<artifactId>animal-sniffer-maven-plugin</artifactId>
156-
<version>1.23</version>
157-
<configuration>
158-
<signature>
159-
<groupId>org.codehaus.mojo.signature</groupId>
160-
<artifactId>java18</artifactId>
161-
<version>1.0</version>
162-
</signature>
163-
<skip>false</skip>
164-
</configuration>
165-
<executions>
166-
<execution>
167-
<id>enforce-java-8-compatibility</id>
168-
<phase>process-classes</phase>
169-
<goals>
170-
<goal>check</goal>
171-
</goals>
172-
</execution>
173-
</executions>
174-
</plugin>
175167
<plugin>
176168
<groupId>org.apache.maven.plugins</groupId>
177169
<artifactId>maven-gpg-plugin</artifactId>
@@ -330,6 +322,8 @@
330322
<module>sdk-workflows</module>
331323
<module>sdk-springboot</module>
332324
<module>examples</module>
325+
<!-- We are following test containers artifact convention on purpose, don't rename -->
326+
<module>testcontainers-dapr</module>
333327
<!-- don't add sdk-tests to the build,
334328
it's only used for CI testing by github action
335329
<module>sdk-tests</module>

‎sdk-tests/pom.xml

+21
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,15 @@
1616
<maven.compiler.target>17</maven.compiler.target>
1717
<maven.deploy.skip>true</maven.deploy.skip>
1818
<dapr.sdk.version>1.12.0-SNAPSHOT</dapr.sdk.version>
19+
<dapr.sdk.alpha.version>0.12.0-SNAPSHOT</dapr.sdk.alpha.version>
1920
<protobuf.output.directory>${project.build.directory}/generated-sources</protobuf.output.directory>
2021
<protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory>
2122
<grpc.version>1.59.0</grpc.version>
2223
<protobuf.version>3.17.3</protobuf.version>
2324
<opentelemetry.version>1.39.0</opentelemetry.version>
2425
<spring-boot.version>3.3.1</spring-boot.version>
26+
<logback-classic.version>1.4.12</logback-classic.version>
27+
<wiremock.version>3.9.1</wiremock.version>
2528
</properties>
2629

2730
<dependencyManagement>
@@ -130,6 +133,12 @@
130133
<version>${dapr.sdk.version}</version>
131134
<scope>test</scope>
132135
</dependency>
136+
<dependency>
137+
<groupId>io.dapr</groupId>
138+
<artifactId>testcontainers-dapr</artifactId>
139+
<version>${dapr.sdk.alpha.version}</version>
140+
<scope>test</scope>
141+
</dependency>
133142
<dependency>
134143
<groupId>io.dapr</groupId>
135144
<artifactId>dapr-sdk-actors</artifactId>
@@ -147,6 +156,18 @@
147156
<artifactId>spring-boot-starter-test</artifactId>
148157
<scope>test</scope>
149158
</dependency>
159+
<dependency>
160+
<groupId>org.wiremock</groupId>
161+
<artifactId>wiremock-standalone</artifactId>
162+
<version>${wiremock.version}</version>
163+
<scope>test</scope>
164+
</dependency>
165+
<dependency>
166+
<groupId>ch.qos.logback</groupId>
167+
<artifactId>logback-classic</artifactId>
168+
<version>${logback-classic.version}</version>
169+
<scope>test</scope>
170+
</dependency>
150171
<dependency>
151172
<groupId>org.springframework.boot</groupId>
152173
<artifactId>spring-boot-starter-web</artifactId>

0 commit comments

Comments
 (0)