Skip to content

Commit 142cc30

Browse files
siri-varmasiri-varma
authored
Merge branch 'master' into api-promotion
2 parents 7bb9bd3 + fd2606b commit 142cc30

File tree

27 files changed

+181
-574
lines changed

27 files changed

+181
-574
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,9 @@ jobs:
7474
DAPR_REF:
7575
TOXIPROXY_URL: https://github.com/Shopify/toxiproxy/releases/download/v2.5.0/toxiproxy-server-linux-amd64
7676
steps:
77-
- name: Install Stable Docker
78-
id: setup_docker
79-
uses: docker/setup-docker-action@v4
80-
- name: Check Docker version
81-
run: docker version
8277
- uses: actions/checkout@v5
78+
- name: Check Docker version
79+
run: docker version
8380
- name: Set up OpenJDK ${{ env.JDK_VER }}
8481
uses: actions/setup-java@v5
8582
with:
@@ -153,8 +150,6 @@ jobs:
153150
- name: Integration tests using spring boot version ${{ matrix.spring-boot-version }}
154151
id: integration_tests
155152
run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} ./mvnw -B -Pintegration-tests dependency:copy-dependencies verify
156-
env:
157-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
158153
- name: Upload failsafe test report for sdk-tests on failure
159154
if: ${{ failure() && steps.integration_tests.conclusion == 'failure' }}
160155
uses: actions/upload-artifact@v5

‎.github/workflows/validate.yml‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ jobs:
4949
with:
5050
distribution: 'temurin'
5151
java-version: ${{ env.JDK_VER }}
52-
- name: Install Stable Docker
53-
id: setup_docker
54-
uses: docker/setup-docker-action@v4
5552
- name: Check Docker version
5653
run: docker version
5754
- name: Set up Dapr CLI
@@ -116,114 +113,76 @@ jobs:
116113
run: sleep 30 && docker logs dapr_scheduler && nc -vz localhost 50006
117114
- name: Install jars
118115
run: ./mvnw clean install -DskipTests -q
119-
env:
120-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
121116
- name: Validate workflows example
122117
working-directory: ./examples
123118
run: |
124119
mm.py ./src/main/java/io/dapr/examples/workflows/README.md
125-
env:
126-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
127120
- name: Validate Spring Boot examples
128121
working-directory: ./spring-boot-examples
129122
run: |
130123
mm.py README.md
131-
env:
132-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
133124
- name: Validate Spring Boot Workflow Patterns examples
134125
working-directory: ./spring-boot-examples/workflows/patterns
135126
run: |
136127
mm.py README.md
137-
env:
138-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
139128
- name: Validate Jobs example
140129
working-directory: ./examples
141130
run: |
142131
mm.py ./src/main/java/io/dapr/examples/jobs/README.md
143-
env:
144-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
145132
- name: Validate conversation ai example
146133
working-directory: ./examples
147134
run: |
148135
mm.py ./src/main/java/io/dapr/examples/conversation/README.md
149-
env:
150-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
151136
- name: Validate invoke http example
152137
working-directory: ./examples
153138
run: |
154139
mm.py ./src/main/java/io/dapr/examples/invoke/http/README.md
155-
env:
156-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
157140
- name: Validate invoke grpc example
158141
working-directory: ./examples
159142
run: |
160143
mm.py ./src/main/java/io/dapr/examples/invoke/grpc/README.md
161-
env:
162-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
163144
- name: Validate tracing example
164145
working-directory: ./examples
165146
run: |
166147
mm.py ./src/main/java/io/dapr/examples/tracing/README.md
167-
env:
168-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
169148
- name: Validate expection handling example
170149
working-directory: ./examples
171150
run: |
172151
mm.py ./src/main/java/io/dapr/examples/exception/README.md
173-
env:
174-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
175152
- name: Validate state example
176153
working-directory: ./examples
177154
run: |
178155
mm.py ./src/main/java/io/dapr/examples/state/README.md
179-
env:
180-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
181156
- name: Validate pubsub example
182157
working-directory: ./examples
183158
run: |
184159
mm.py ./src/main/java/io/dapr/examples/pubsub/README.md
185-
env:
186-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
187160
- name: Validate bindings HTTP example
188161
working-directory: ./examples
189162
run: |
190163
mm.py ./src/main/java/io/dapr/examples/bindings/http/README.md
191-
env:
192-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
193164
- name: Validate secrets example
194165
working-directory: ./examples
195166
run: |
196167
mm.py ./src/main/java/io/dapr/examples/secrets/README.md
197-
env:
198-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
199168
- name: Validate unit testing example
200169
working-directory: ./examples
201170
run: |
202171
mm.py ./src/main/java/io/dapr/examples/unittesting/README.md
203-
env:
204-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
205172
- name: Validate Configuration API example
206173
working-directory: ./examples
207174
run: |
208175
mm.py ./src/main/java/io/dapr/examples/configuration/README.md
209-
env:
210-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
211176
- name: Validate actors example
212177
working-directory: ./examples
213178
run: |
214179
mm.py ./src/main/java/io/dapr/examples/actors/README.md
215-
env:
216-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
217180
- name: Validate query state HTTP example
218181
working-directory: ./examples
219182
run: |
220183
mm.py ./src/main/java/io/dapr/examples/querystate/README.md
221-
env:
222-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
223184
- name: Validate streaming subscription example
224185
working-directory: ./examples
225186
run: |
226187
mm.py ./src/main/java/io/dapr/examples/pubsub/stream/README.md
227-
env:
228-
DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
229188

‎.mise.toml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[tools]
2+
java = "temurin-17"
3+
4+
[env]
5+
JAVA_HOME = "{{exec(command='mise where java')}}"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
99
<version>1.17.0-SNAPSHOT</version>
10+
<relativePath>../pom.xml</relativePath>
1011
</parent>
1112

1213
<artifactId>dapr-spring-boot-autoconfigure</artifactId>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
99
<version>1.17.0-SNAPSHOT</version>
10+
<relativePath>../pom.xml</relativePath>
1011
</parent>
1112

1213
<artifactId>dapr-spring-boot-tests</artifactId>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
99
<version>1.17.0-SNAPSHOT</version>
10+
<relativePath>../pom.xml</relativePath>
1011
</parent>
1112

1213
<artifactId>dapr-spring-data</artifactId>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
99
<version>1.17.0-SNAPSHOT</version>
10+
<relativePath>../pom.xml</relativePath>
1011
</parent>
1112

1213
<artifactId>dapr-spring-messaging</artifactId>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
99
<version>1.17.0-SNAPSHOT</version>
10+
<relativePath>../pom.xml</relativePath>
1011
</parent>
1112

1213
<artifactId>dapr-spring-workflows</artifactId>

‎dapr-spring/pom.xml‎

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<groupId>io.dapr</groupId>
99
<artifactId>dapr-sdk-parent</artifactId>
1010
<version>1.17.0-SNAPSHOT</version>
11+
<relativePath>../pom.xml</relativePath>
1112
</parent>
1213

1314
<groupId>io.dapr.spring</groupId>
@@ -73,55 +74,15 @@
7374
<plugin>
7475
<groupId>org.apache.maven.plugins</groupId>
7576
<artifactId>maven-source-plugin</artifactId>
76-
<version>3.3.1</version>
77-
<executions>
78-
<execution>
79-
<id>attach-sources</id>
80-
<goals>
81-
<goal>jar-no-fork</goal>
82-
</goals>
83-
</execution>
84-
</executions>
8577
</plugin>
86-
8778
<plugin>
8879
<groupId>org.apache.maven.plugins</groupId>
8980
<artifactId>maven-javadoc-plugin</artifactId>
90-
<version>3.2.0</version>
91-
<configuration>
92-
<notimestamp>true</notimestamp>
93-
</configuration>
94-
<executions>
95-
<execution>
96-
<id>attach-javadocs</id>
97-
<goals>
98-
<goal>jar</goal>
99-
</goals>
100-
</execution>
101-
</executions>
10281
</plugin>
103-
10482
<plugin>
10583
<groupId>org.jacoco</groupId>
10684
<artifactId>jacoco-maven-plugin</artifactId>
107-
<version>0.8.12</version>
10885
<executions>
109-
<execution>
110-
<id>default-prepare-agent</id>
111-
<goals>
112-
<goal>prepare-agent</goal>
113-
</goals>
114-
</execution>
115-
<execution>
116-
<id>report</id>
117-
<phase>test</phase>
118-
<goals>
119-
<goal>report</goal>
120-
</goals>
121-
<configuration>
122-
<outputDirectory>target/jacoco-report/</outputDirectory>
123-
</configuration>
124-
</execution>
12586
<execution>
12687
<id>check</id>
12788
<goals>

‎examples/pom.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<groupId>io.dapr</groupId>
99
<artifactId>dapr-sdk-parent</artifactId>
1010
<version>1.17.0-SNAPSHOT</version>
11+
<relativePath>../pom.xml</relativePath>
1112
</parent>
1213

1314
<artifactId>dapr-sdk-examples</artifactId>
@@ -135,7 +136,7 @@
135136
<plugin>
136137
<groupId>org.xolstice.maven.plugins</groupId>
137138
<artifactId>protobuf-maven-plugin</artifactId>
138-
<version>0.6.1</version>
139+
<version>${protobuf-maven-plugin.version}</version>
139140
<configuration>
140141
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
141142
<pluginId>grpc-java</pluginId>
@@ -154,15 +155,15 @@
154155
<plugin>
155156
<groupId>org.apache.maven.plugins</groupId>
156157
<artifactId>maven-compiler-plugin</artifactId>
157-
<version>3.13.0</version>
158+
<version>${maven-compiler-plugin.version}</version>
158159
<configuration>
159160
<release>${java.version}</release>
160161
</configuration>
161162
</plugin>
162163
<plugin>
163164
<groupId>org.apache.maven.plugins</groupId>
164165
<artifactId>maven-site-plugin</artifactId>
165-
<version>3.12.1</version>
166+
<version>${maven-site-plugin.version}</version>
166167
<configuration>
167168
<skip>true</skip>
168169
</configuration>

0 commit comments

Comments
 (0)