Skip to content

Commit a905e09

Browse files
committed
Merge branch 'users/svegiraju/cron-2' of https://github.com/siri-varma/java-sdk into users/svegiraju/cron-2
2 parents a7ec627 + 70a6441 commit a905e09

File tree

10 files changed

+23
-23
lines changed

10 files changed

+23
-23
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ jobs:
3838
GOARCH: amd64
3939
GOPROXY: https://proxy.golang.org
4040
JDK_VER: ${{ matrix.java }}
41-
DAPR_CLI_VER: 1.14.0
42-
DAPR_RUNTIME_VER: 1.14.4
43-
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0/install/install.sh
41+
DAPR_CLI_VER: 1.15.0
42+
DAPR_RUNTIME_VER: 1.15.3
43+
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
4444
DAPR_CLI_REF:
4545
DAPR_REF:
4646
TOXIPROXY_URL: https://github.com/Shopify/toxiproxy/releases/download/v2.5.0/toxiproxy-server-linux-amd64
@@ -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 }}

.github/workflows/validate.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ jobs:
3737
GOARCH: amd64
3838
GOPROXY: https://proxy.golang.org
3939
JDK_VER: ${{ matrix.java }}
40-
DAPR_CLI_VER: 1.14.0
41-
DAPR_RUNTIME_VER: 1.14.4
42-
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0/install/install.sh
40+
DAPR_CLI_VER: 1.15.0
41+
DAPR_RUNTIME_VER: 1.15.3
42+
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
4343
DAPR_CLI_REF:
4444
DAPR_REF:
4545
steps:

examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>commons-cli</groupId>
3131
<artifactId>commons-cli</artifactId>
32-
<version>1.8.0</version>
32+
<version>1.9.0</version>
3333
</dependency>
3434
<dependency>
3535
<groupId>io.grpc</groupId>

pom.xml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,11 @@
168168
<artifactId>nexus-staging-maven-plugin</artifactId>
169169
<version>${nexus-staging-maven-plugin.version}</version>
170170
<extensions>true</extensions>
171+
<configuration>
172+
<serverId>ossrh</serverId>
173+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
174+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
175+
</configuration>
171176
</plugin>
172177
</plugins>
173178
</pluginManagement>
@@ -210,17 +215,6 @@
210215
</execution>
211216
</executions>
212217
</plugin>
213-
<plugin>
214-
<groupId>org.sonatype.plugins</groupId>
215-
<artifactId>nexus-staging-maven-plugin</artifactId>
216-
<version>1.6.13</version>
217-
<extensions>true</extensions>
218-
<configuration>
219-
<serverId>ossrh</serverId>
220-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
221-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
222-
</configuration>
223-
</plugin>
224218
<plugin>
225219
<groupId>org.apache.maven.plugins</groupId>
226220
<artifactId>maven-checkstyle-plugin</artifactId>

sdk-actors/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>commons-cli</groupId>
4747
<artifactId>commons-cli</artifactId>
48-
<version>1.4</version>
48+
<version>1.9.0</version>
4949
<scope>test</scope>
5050
</dependency>
5151
<dependency>

sdk-tests/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@
4949
</dependencyManagement>
5050

5151
<dependencies>
52+
<dependency>
53+
<groupId>commons-cli</groupId>
54+
<artifactId>commons-cli</artifactId>
55+
<version>1.9.0</version>
56+
</dependency>
5257
<dependency>
5358
<groupId>io.grpc</groupId>
5459
<artifactId>grpc-protobuf</artifactId>

sdk/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<dependency>
5959
<groupId>commons-cli</groupId>
6060
<artifactId>commons-cli</artifactId>
61-
<version>1.4</version>
61+
<version>1.9.0</version>
6262
<scope>test</scope>
6363
</dependency>
6464
<dependency>

spring-boot-examples/consumer-app/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<plugin>
8484
<groupId>org.springframework.boot</groupId>
8585
<artifactId>spring-boot-maven-plugin</artifactId>
86+
<version>${springboot.version}</version>
8687
</plugin>
8788
<plugin>
8889
<groupId>org.apache.maven.plugins</groupId>

spring-boot-examples/consumer-app/src/test/java/io/dapr/springboot/examples/consumer/DaprTestContainersConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public RabbitMQContainer rabbitMQContainer(Network daprNetwork, Environment env)
6969
return new RabbitMQContainer(DockerImageName.parse("rabbitmq:3.7.25-management-alpine"))
7070
.withExposedPorts(5672)
7171
.withNetworkAliases("rabbitmq")
72-
.withReuse(true)
72+
.withReuse(reuse)
7373
.withNetwork(daprNetwork);
7474
}
7575

spring-boot-examples/producer-app/src/test/java/io/dapr/springboot/examples/producer/DaprTestContainersConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public RabbitMQContainer rabbitMQContainer(Network daprNetwork, Environment env)
8080
return new RabbitMQContainer(DockerImageName.parse("rabbitmq:3.7.25-management-alpine"))
8181
.withExposedPorts(5672)
8282
.withNetworkAliases("rabbitmq")
83-
.withReuse(true)
83+
.withReuse(reuse)
8484
.withNetwork(daprNetwork);
8585

8686
}

0 commit comments

Comments
 (0)