Skip to content

Commit fc63a33

Browse files
committed
Merge branch 'users/svegiraju/cron-2' of https://github.com/siri-varma/java-sdk into users/svegiraju/cron-2
2 parents aed0403 + ddc5bf6 commit fc63a33

File tree

1,297 files changed

+31876
-41102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,297 files changed

+31876
-41102
lines changed

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
- name: Unit tests
115115
run: ./mvnw test # making it temporarily verbose.
116116
- name: Codecov
117-
uses: codecov/codecov-action@v4.1.0
117+
uses: codecov/codecov-action@v4.4.1
118118
- name: Install jars
119119
run: ./mvnw install -q -B -DskipTests
120120
- name: Integration tests using spring boot version ${{ matrix.spring-boot-version }}
@@ -174,7 +174,7 @@ jobs:
174174
echo "DEPLOY_OSSRH=true" >> $GITHUB_ENV
175175
- name: Install jars
176176
if: env.DEPLOY_OSSRH == 'true'
177-
run: ./mvnw install -B -q
177+
run: ./mvnw install -DskipTests -B -q
178178
- name: Publish to ossrh
179179
if: env.DEPLOY_OSSRH == 'true'
180180
run: |

CONTRIBUTING.md

+4
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,10 @@ A non-exclusive list of code that must be places in `vendor/`:
120120

121121
**Thank You!** - Your contributions to open source, large or small, make projects like this possible. Thank you for taking the time to contribute.
122122

123+
## Github Dapr Bot Commands
124+
125+
Checkout the [daprbot documentation](https://docs.dapr.io/contributing/daprbot/) for Github commands you can run in this repo for common tasks. For example, you can run the `/assign` (as a comment on an issue) to assign the issue to yourself.
126+
123127
## Code of Conduct
124128

125129
This project has adopted the [Contributor Covenant Code of Conduct](https://github.com/dapr/community/blob/master/CODE-OF-CONDUCT.md)

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@ For a Maven project, add the following to your `pom.xml` file:
5050
<dependency>
5151
<groupId>io.dapr</groupId>
5252
<artifactId>dapr-sdk</artifactId>
53-
<version>1.13.1</version>
53+
<version>1.14.0</version>
5454
</dependency>
5555
<!-- Dapr's SDK for Actors (optional). -->
5656
<dependency>
5757
<groupId>io.dapr</groupId>
5858
<artifactId>dapr-sdk-actors</artifactId>
59-
<version>1.13.1</version>
59+
<version>1.14.0</version>
6060
</dependency>
6161
<!-- Dapr's SDK integration with SpringBoot (optional). -->
6262
<dependency>
6363
<groupId>io.dapr</groupId>
6464
<artifactId>dapr-sdk-springboot</artifactId>
65-
<version>1.13.1</version>
65+
<version>1.14.0</version>
6666
</dependency>
6767
...
6868
</dependencies>
@@ -76,11 +76,11 @@ For a Gradle project, add the following to your `build.gradle` file:
7676
dependencies {
7777
...
7878
// Dapr's core SDK with all features, except Actors.
79-
compile('io.dapr:dapr-sdk:1.13.1')
79+
compile('io.dapr:dapr-sdk:1.14.0')
8080
// Dapr's SDK for Actors (optional).
81-
compile('io.dapr:dapr-sdk-actors:1.13.1')
81+
compile('io.dapr:dapr-sdk-actors:1.14.0')
8282
// Dapr's SDK integration with SpringBoot (optional).
83-
compile('io.dapr:dapr-sdk-springboot:1.13.1')
83+
compile('io.dapr:dapr-sdk-springboot:1.14.0')
8484
}
8585
```
8686

dapr-spring/pom.xml

+29
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
<maven.compiler.source>11</maven.compiler.source>
3333
<maven.compiler.target>11</maven.compiler.target>
3434
<maven.compiler.release>11</maven.compiler.release>
35+
<testcontainers.version>1.19.8</testcontainers.version>
36+
<junit.version>5.10.2</junit.version>
3537
</properties>
3638

3739
<dependencyManagement>
@@ -43,6 +45,31 @@
4345
<type>pom</type>
4446
<scope>import</scope>
4547
</dependency>
48+
<dependency>
49+
<groupId>org.junit.jupiter</groupId>
50+
<artifactId>junit-jupiter-api</artifactId>
51+
<version>${junit.version}</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.junit.jupiter</groupId>
55+
<artifactId>junit-jupiter-params</artifactId>
56+
<version>${junit.version}</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.junit.jupiter</groupId>
60+
<artifactId>junit-jupiter-engine</artifactId>
61+
<version>${junit.version}</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>org.junit.jupiter</groupId>
65+
<artifactId>junit-jupiter</artifactId>
66+
<version>${junit.version}</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.testcontainers</groupId>
70+
<artifactId>junit-jupiter</artifactId>
71+
<version>${testcontainers.version}</version>
72+
</dependency>
4673
</dependencies>
4774
</dependencyManagement>
4875

@@ -73,13 +100,15 @@
73100
<dependency>
74101
<groupId>org.springframework.boot</groupId>
75102
<artifactId>spring-boot-configuration-processor</artifactId>
103+
<version>${springboot.version}</version>
76104
<optional>true</optional>
77105
</dependency>
78106

79107
<!-- Test dependencies -->
80108
<dependency>
81109
<groupId>org.springframework.boot</groupId>
82110
<artifactId>spring-boot-starter-test</artifactId>
111+
<version>${springboot.version}</version>
83112
<scope>test</scope>
84113
</dependency>
85114
<dependency>

daprdocs/content/en/java-sdk-contributing/java-contributing.md

+4
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,7 @@ The `daprdocs` directory contains the markdown files that are rendered into the
2121

2222
- All rules in the [docs guide]({{< ref contributing-docs.md >}}) should be followed in addition to these.
2323
- All files and directories should be prefixed with `java-` to ensure all file/directory names are globally unique across all Dapr documentation.
24+
25+
## Github Dapr Bot Commands
26+
27+
Checkout the [daprbot documentation](https://docs.dapr.io/contributing/daprbot/) for Github commands you can run in this repo for common tasks. For example, you can run the `/assign` (as a comment on an issue) to assign the issue to yourself.

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,19 @@ For a Maven project, add the following to your `pom.xml` file:
4646
<dependency>
4747
<groupId>io.dapr</groupId>
4848
<artifactId>dapr-sdk</artifactId>
49-
<version>1.13.1</version>
49+
<version>1.14.0</version>
5050
</dependency>
5151
<!-- Dapr's SDK for Actors (optional). -->
5252
<dependency>
5353
<groupId>io.dapr</groupId>
5454
<artifactId>dapr-sdk-actors</artifactId>
55-
<version>1.13.1</version>
55+
<version>1.14.0</version>
5656
</dependency>
5757
<!-- Dapr's SDK integration with SpringBoot (optional). -->
5858
<dependency>
5959
<groupId>io.dapr</groupId>
6060
<artifactId>dapr-sdk-springboot</artifactId>
61-
<version>1.13.1</version>
61+
<version>1.14.0</version>
6262
</dependency>
6363
...
6464
</dependencies>
@@ -76,11 +76,11 @@ For a Gradle project, add the following to your `build.gradle` file:
7676
dependencies {
7777
...
7878
// Dapr's core SDK with all features, except Actors.
79-
compile('io.dapr:dapr-sdk:1.13.1')
79+
compile('io.dapr:dapr-sdk:1.14.0')
8080
// Dapr's SDK for Actors (optional).
81-
compile('io.dapr:dapr-sdk-actors:1.13.1')
81+
compile('io.dapr:dapr-sdk-actors:1.14.0')
8282
// Dapr's SDK integration with SpringBoot (optional).
83-
compile('io.dapr:dapr-sdk-springboot:1.13.1')
83+
compile('io.dapr:dapr-sdk-springboot:1.14.0')
8484
}
8585
```
8686

@@ -96,7 +96,7 @@ You can fix this by specifying a compatible `OkHttp` version in your project to
9696
<dependency>
9797
<groupId>com.squareup.okhttp3</groupId>
9898
<artifactId>okhttp</artifactId>
99-
<version>1.13.1</version>
99+
<version>1.14.0</version>
100100
</dependency>
101101
```
102102

daprdocs/content/en/java-sdk-docs/spring-boot/_index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ If you already have a Spring Boot application (Spring Boot 3.x+), you can direct
2525
<dependency>
2626
<groupId>io.dapr.spring</groupId>
2727
<artifactId>dapr-spring-boot-starter</artifactId>
28-
<version>0.13.1</version>
28+
<version>0.14.0</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>io.dapr.spring</groupId>
3232
<artifactId>dapr-spring-boot-starter-test</artifactId>
33-
<version>0.13.1</version>
33+
<version>0.14.0</version>
3434
<scope>test</scope>
3535
</dependency>
3636
```

0 commit comments

Comments
 (0)