Skip to content

Commit d14ce3e

Browse files
siri-varmasiri-varma
committed
Merge branch 'users/svegiraju/conversation-api-2' of https://github.com/siri-varma/java-sdk into users/svegiraju/conversation-api-2
2 parents fada33f + ca2dd02 commit d14ce3e

File tree

22 files changed

+178
-82
lines changed

22 files changed

+178
-82
lines changed

‎.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
publish:
147147
runs-on: ubuntu-latest
148148
needs: build
149-
timeout-minutes: 10
149+
timeout-minutes: 30
150150
env:
151151
JDK_VER: 17
152152
OSSRH_USER_TOKEN: ${{ secrets.OSSRH_USER_TOKEN }}
@@ -181,4 +181,4 @@ jobs:
181181
echo ${{ secrets.GPG_PRIVATE_KEY }} | base64 -d > private-key.gpg
182182
export GPG_TTY=$(tty)
183183
gpg --batch --import private-key.gpg
184-
./mvnw -V -B -Dgpg.skip=false -s settings.xml deploy -Pdeploy-profile
184+
./mvnw -V -B -Dgpg.skip=false -s settings.xml deploy

‎.github/workflows/create-release.yml

+1-18
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,4 @@ jobs:
5353
git remote set-url origin https://x-access-token:${{ secrets.DAPR_BOT_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git
5454
# Copy first to allow automation to use the latest version and not the release branch's version.
5555
cp -R ./.github/scripts ${RUNNER_TEMP}/
56-
${RUNNER_TEMP}/scripts/create-release.sh ${{ inputs.rel_version }}
57-
trigger:
58-
name: Triggers the Dapr SDK build
59-
runs-on: ubuntu-latest
60-
needs: create-release
61-
steps:
62-
- name: Identify build ref to trigger build and release.
63-
run: |
64-
if [[ "${{ inputs.rel_version }}" == *"SNAPSHOT"* ]]; then
65-
echo "BUILD_GIT_REF=master" >> $GITHUB_ENV
66-
else
67-
echo "BUILD_GIT_REF=v${{ inputs.rel_version }}" >> $GITHUB_ENV
68-
fi
69-
- name: Triggers the build and release.
70-
env:
71-
GITHUB_TOKEN: ${{ secrets.DAPR_BOT_TOKEN }}
72-
run: |
73-
gh workflow run build.yml --repo ${GITHUB_REPOSITORY} --ref '${{ env.BUILD_GIT_REF }}'
56+
${RUNNER_TEMP}/scripts/create-release.sh ${{ inputs.rel_version }}

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

+8-1
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,12 @@
7575
<scope>test</scope>
7676
</dependency>
7777
</dependencies>
78-
78+
<build>
79+
<plugins>
80+
<plugin>
81+
<groupId>org.sonatype.plugins</groupId>
82+
<artifactId>nexus-staging-maven-plugin</artifactId>
83+
</plugin>
84+
</plugins>
85+
</build>
7986
</project>

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

+8-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,12 @@
4040
<optional>true</optional>
4141
</dependency>
4242
</dependencies>
43-
43+
<build>
44+
<plugins>
45+
<plugin>
46+
<groupId>org.sonatype.plugins</groupId>
47+
<artifactId>nexus-staging-maven-plugin</artifactId>
48+
</plugin>
49+
</plugins>
50+
</build>
4451
</project>

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

+8
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,12 @@
4747
</dependency>
4848
</dependencies>
4949

50+
<build>
51+
<plugins>
52+
<plugin>
53+
<groupId>org.sonatype.plugins</groupId>
54+
<artifactId>nexus-staging-maven-plugin</artifactId>
55+
</plugin>
56+
</plugins>
57+
</build>
5058
</project>

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

+8-1
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,12 @@
4141
<version>${dapr.sdk.alpha.version}</version>
4242
</dependency>
4343
</dependencies>
44-
44+
<build>
45+
<plugins>
46+
<plugin>
47+
<groupId>org.sonatype.plugins</groupId>
48+
<artifactId>nexus-staging-maven-plugin</artifactId>
49+
</plugin>
50+
</plugins>
51+
</build>
4552
</project>

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

+8
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,12 @@
2121
</dependency>
2222
</dependencies>
2323

24+
<build>
25+
<plugins>
26+
<plugin>
27+
<groupId>org.sonatype.plugins</groupId>
28+
<artifactId>nexus-staging-maven-plugin</artifactId>
29+
</plugin>
30+
</plugins>
31+
</build>
2432
</project>

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

+8
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,12 @@
1414
<description>Dapr Spring Messaging</description>
1515
<packaging>jar</packaging>
1616

17+
<build>
18+
<plugins>
19+
<plugin>
20+
<groupId>org.sonatype.plugins</groupId>
21+
<artifactId>nexus-staging-maven-plugin</artifactId>
22+
</plugin>
23+
</plugins>
24+
</build>
1725
</project>

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

+8
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,12 @@
2121
<version>${project.version}</version>
2222
</dependency>
2323
</dependencies>
24+
<build>
25+
<plugins>
26+
<plugin>
27+
<groupId>org.sonatype.plugins</groupId>
28+
<artifactId>nexus-staging-maven-plugin</artifactId>
29+
</plugin>
30+
</plugins>
31+
</build>
2432
</project>

‎dapr-spring/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@
9292

9393
<build>
9494
<plugins>
95+
<plugin>
96+
<groupId>org.sonatype.plugins</groupId>
97+
<artifactId>nexus-staging-maven-plugin</artifactId>
98+
</plugin>
9599
<plugin>
96100
<groupId>org.apache.maven.plugins</groupId>
97101
<artifactId>maven-source-plugin</artifactId>

‎examples/pom.xml

-9
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<java.version>17</java.version>
2222
<maven.compiler.source>${java.version}</maven.compiler.source>
2323
<maven.compiler.target>${java.version}</maven.compiler.target>
24-
<maven.deploy.skip>true</maven.deploy.skip>
2524
<spotbugs.fail>false</spotbugs.fail>
2625
<opentelemetry.version>0.14.0</opentelemetry.version>
2726
</properties>
@@ -189,14 +188,6 @@
189188
<release>${java.version}</release>
190189
</configuration>
191190
</plugin>
192-
<plugin>
193-
<groupId>org.apache.maven.plugins</groupId>
194-
<artifactId>maven-deploy-plugin</artifactId>
195-
<version>${maven-deploy-plugin.version}</version>
196-
<configuration>
197-
<skip>true</skip>
198-
</configuration>
199-
</plugin>
200191
<plugin>
201192
<groupId>org.apache.maven.plugins</groupId>
202193
<artifactId>maven-site-plugin</artifactId>

‎pom.xml

+17-25
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<snakeyaml.version>2.0</snakeyaml.version>
4747
<testcontainers.version>1.20.0</testcontainers.version>
4848
<springboot.version>3.4.3</springboot.version>
49+
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
4950
</properties>
5051

5152
<distributionManagement>
@@ -162,10 +163,25 @@
162163
<artifactId>maven-resources-plugin</artifactId>
163164
<version>${maven-resources-plugin.version}</version>
164165
</plugin>
166+
<plugin>
167+
<groupId>org.sonatype.plugins</groupId>
168+
<artifactId>nexus-staging-maven-plugin</artifactId>
169+
<version>${nexus-staging-maven-plugin.version}</version>
170+
<extensions>true</extensions>
171+
<configuration>
172+
<serverId>ossrh</serverId>
173+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
174+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
175+
</configuration>
176+
</plugin>
165177
</plugins>
166178
</pluginManagement>
167-
168179
<plugins>
180+
<plugin>
181+
<groupId>org.sonatype.plugins</groupId>
182+
<artifactId>nexus-staging-maven-plugin</artifactId>
183+
<inherited>false</inherited>
184+
</plugin>
169185
<plugin>
170186
<groupId>org.jacoco</groupId>
171187
<artifactId>jacoco-maven-plugin</artifactId>
@@ -199,17 +215,6 @@
199215
</execution>
200216
</executions>
201217
</plugin>
202-
<plugin>
203-
<groupId>org.sonatype.plugins</groupId>
204-
<artifactId>nexus-staging-maven-plugin</artifactId>
205-
<version>1.6.13</version>
206-
<extensions>true</extensions>
207-
<configuration>
208-
<serverId>ossrh</serverId>
209-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
210-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
211-
</configuration>
212-
</plugin>
213218
<plugin>
214219
<groupId>org.apache.maven.plugins</groupId>
215220
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -344,19 +349,6 @@
344349
</modules>
345350

346351
<profiles>
347-
<profile>
348-
<id>deploy-profile</id>
349-
<modules>
350-
<!-- Include only the modules to be deployed -->
351-
<module>sdk-autogen</module>
352-
<module>sdk</module>
353-
<module>sdk-actors</module>
354-
<module>sdk-springboot</module>
355-
<module>sdk-workflows</module>
356-
<module>testcontainers-dapr</module>
357-
<module>dapr-spring</module>
358-
</modules>
359-
</profile>
360352
<profile>
361353
<id>integration-tests</id>
362354
<modules>

‎sdk-actors/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@
7070

7171
<build>
7272
<plugins>
73+
<plugin>
74+
<groupId>org.sonatype.plugins</groupId>
75+
<artifactId>nexus-staging-maven-plugin</artifactId>
76+
</plugin>
7377
<plugin>
7478
<groupId>org.apache.maven.plugins</groupId>
7579
<artifactId>maven-source-plugin</artifactId>

‎sdk-autogen/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@
6464

6565
<build>
6666
<plugins>
67+
<plugin>
68+
<groupId>org.sonatype.plugins</groupId>
69+
<artifactId>nexus-staging-maven-plugin</artifactId>
70+
</plugin>
6771
<plugin>
6872
<groupId>com.googlecode.maven-download-plugin</groupId>
6973
<artifactId>download-maven-plugin</artifactId>

‎sdk-springboot/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
<name>dapr-sdk-springboot</name>
1717
<description>SDK extension for Springboot</description>
1818

19-
<properties>
20-
<maven.deploy.skip>false</maven.deploy.skip>
21-
</properties>
22-
2319
<dependencyManagement>
2420
<dependencies>
2521
<dependency>
@@ -85,6 +81,10 @@
8581

8682
<build>
8783
<plugins>
84+
<plugin>
85+
<groupId>org.sonatype.plugins</groupId>
86+
<artifactId>nexus-staging-maven-plugin</artifactId>
87+
</plugin>
8888
<plugin>
8989
<groupId>org.apache.maven.plugins</groupId>
9090
<artifactId>maven-source-plugin</artifactId>

‎sdk-workflows/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
<name>dapr-sdk-workflows</name>
1717
<description>SDK for Workflows on Dapr</description>
1818

19-
<properties>
20-
<maven.deploy.skip>false</maven.deploy.skip>
21-
</properties>
22-
2319
<dependencies>
2420
<dependency>
2521
<groupId>io.dapr</groupId>
@@ -82,6 +78,10 @@
8278

8379
<build>
8480
<plugins>
81+
<plugin>
82+
<groupId>org.sonatype.plugins</groupId>
83+
<artifactId>nexus-staging-maven-plugin</artifactId>
84+
</plugin>
8585
<plugin>
8686
<groupId>org.apache.maven.plugins</groupId>
8787
<artifactId>maven-source-plugin</artifactId>

‎sdk/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,10 @@
177177
</resource>
178178
</resources>
179179
<plugins>
180+
<plugin>
181+
<groupId>org.sonatype.plugins</groupId>
182+
<artifactId>nexus-staging-maven-plugin</artifactId>
183+
</plugin>
180184
<plugin>
181185
<groupId>org.apache.maven.plugins</groupId>
182186
<artifactId>maven-resources-plugin</artifactId>

‎sdk/src/test/java/io/dapr/client/DaprClientBuilderTest.java

+16-5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import io.dapr.exceptions.DaprException;
1919
import io.dapr.serializer.DaprObjectSerializer;
2020
import org.junit.jupiter.api.Test;
21+
import org.junit.jupiter.api.AfterEach;
2122

2223
import static org.junit.jupiter.api.Assertions.assertNotNull;
2324
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -27,6 +28,16 @@
2728

2829
public class DaprClientBuilderTest {
2930

31+
private DaprClient client;
32+
33+
@AfterEach
34+
public void cleanup() throws Exception {
35+
if (client != null) {
36+
client.close();
37+
client = null;
38+
}
39+
}
40+
3041
@Test
3142
public void build() {
3243
DaprObjectSerializer objectSerializer = mock(DaprObjectSerializer.class);
@@ -35,17 +46,17 @@ public void build() {
3546
DaprClientBuilder daprClientBuilder = new DaprClientBuilder();
3647
daprClientBuilder.withObjectSerializer(objectSerializer);
3748
daprClientBuilder.withStateSerializer(stateSerializer);
38-
DaprClient daprClient = daprClientBuilder.build();
39-
assertNotNull(daprClient);
49+
client = daprClientBuilder.build();
50+
assertNotNull(client);
4051
}
4152

4253
@Test
4354
public void buildWithOverrideSidecarIP() {
4455
DaprClientBuilder daprClientBuilder = new DaprClientBuilder();
4556
daprClientBuilder.withPropertyOverride(Properties.SIDECAR_IP, "unknownhost");
46-
DaprClient daprClient = daprClientBuilder.build();
47-
assertNotNull(daprClient);
48-
DaprException thrown = assertThrows(DaprException.class, () -> { daprClient.getMetadata().block(); });
57+
client = daprClientBuilder.build();
58+
assertNotNull(client);
59+
DaprException thrown = assertThrows(DaprException.class, () -> { client.getMetadata().block(); });
4960
assertTrue(thrown.toString().contains("UNAVAILABLE"), thrown.toString());
5061

5162
}

0 commit comments

Comments
 (0)