Skip to content

Commit 619db4a

Browse files
champelchampel
authored
Merge branch 'master' into bump-to-spring-boot-2-7-8
Signed-off-by: champel <[email protected]>
2 parents 9152c91 + 10d0961 commit 619db4a

File tree

10 files changed

+22
-22
lines changed

10 files changed

+22
-22
lines changed

‎.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
GOARCH: amd64
2626
GOPROXY: https://proxy.golang.org
2727
JDK_VER: ${{ matrix.java }}
28-
DAPR_CLI_VER: 1.9.1
29-
DAPR_RUNTIME_VER: 1.9.3
30-
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.9.1/install/install.sh
28+
DAPR_CLI_VER: 1.10.0-rc.1
29+
DAPR_RUNTIME_VER: 1.10.0-rc.2
30+
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.10.0-rc.1/install/install.sh
3131
DAPR_CLI_REF:
32-
DAPR_REF: a8c698ad897e42d6624f5fc6ccfd0630e2a8fd00
32+
DAPR_REF:
3333
steps:
3434
- uses: actions/checkout@v3
3535
- name: Set up OpenJDK ${{ env.JDK_VER }}

‎.github/workflows/validate.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ jobs:
3737
GOARCH: amd64
3838
GOPROXY: https://proxy.golang.org
3939
JDK_VER: ${{ matrix.java }}
40-
DAPR_CLI_VER: 1.9.1
41-
DAPR_RUNTIME_VER: 1.9.3
42-
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.9.1/install/install.sh
40+
DAPR_CLI_VER: 1.10.0-rc.1
41+
DAPR_RUNTIME_VER: 1.10.0-rc.2
42+
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.10.0-rc.1/install/install.sh
4343
DAPR_CLI_REF:
44-
DAPR_REF: a8c698ad897e42d6624f5fc6ccfd0630e2a8fd00
44+
DAPR_REF:
4545
steps:
4646
- uses: actions/checkout@v3
4747
- name: Set up OpenJDK ${{ env.JDK_VER }}

‎examples/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>io.dapr</groupId>
99
<artifactId>dapr-sdk-parent</artifactId>
10-
<version>1.8.0-SNAPSHOT</version>
10+
<version>1.9.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>dapr-sdk-examples</artifactId>
1414
<packaging>jar</packaging>
15-
<version>1.8.0-SNAPSHOT</version>
15+
<version>1.9.0-SNAPSHOT</version>
1616
<name>dapr-sdk-examples</name>
1717

1818
<properties>

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>io.dapr</groupId>
88
<artifactId>dapr-sdk-parent</artifactId>
99
<packaging>pom</packaging>
10-
<version>1.8.0-SNAPSHOT</version>
10+
<version>1.9.0-SNAPSHOT</version>
1111
<name>dapr-sdk-parent</name>
1212
<description>SDK for Dapr.</description>
1313
<url>https://dapr.io</url>
@@ -16,7 +16,7 @@
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<grpc.version>1.42.1</grpc.version>
1818
<protobuf.version>3.17.3</protobuf.version>
19-
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/a8c698ad897e42d6624f5fc6ccfd0630e2a8fd00/dapr/proto</dapr.proto.baseurl>
19+
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.10.0-rc.2/dapr/proto</dapr.proto.baseurl>
2020
<os-maven-plugin.version>1.6.2</os-maven-plugin.version>
2121
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
2222
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>

‎sdk-actors/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>io.dapr</groupId>
99
<artifactId>dapr-sdk-parent</artifactId>
10-
<version>1.8.0-SNAPSHOT</version>
10+
<version>1.9.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>dapr-sdk-actors</artifactId>
1414
<packaging>jar</packaging>
15-
<version>1.8.0-SNAPSHOT</version>
15+
<version>1.9.0-SNAPSHOT</version>
1616
<name>dapr-sdk-actors</name>
1717
<description>SDK for Actors on Dapr</description>
1818

‎sdk-autogen/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>io.dapr</groupId>
99
<artifactId>dapr-sdk-parent</artifactId>
10-
<version>1.8.0-SNAPSHOT</version>
10+
<version>1.9.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>dapr-sdk-autogen</artifactId>
1414
<packaging>jar</packaging>
15-
<version>1.8.0-SNAPSHOT</version>
15+
<version>1.9.0-SNAPSHOT</version>
1616
<name>dapr-sdk-autogen</name>
1717
<description>Auto-generated SDK for Dapr</description>
1818

‎sdk-springboot/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>io.dapr</groupId>
99
<artifactId>dapr-sdk-parent</artifactId>
10-
<version>1.8.0-SNAPSHOT</version>
10+
<version>1.9.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>dapr-sdk-springboot</artifactId>
1414
<packaging>jar</packaging>
15-
<version>1.8.0-SNAPSHOT</version>
15+
<version>1.9.0-SNAPSHOT</version>
1616
<name>dapr-sdk-springboot</name>
1717
<description>SDK extension for Springboot</description>
1818

‎sdk-tests/components/secret.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{}
1+
{}

‎sdk-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<maven.compiler.source>11</maven.compiler.source>
1515
<maven.compiler.target>11</maven.compiler.target>
1616
<maven.deploy.skip>true</maven.deploy.skip>
17-
<dapr.sdk.version>1.8.0-SNAPSHOT</dapr.sdk.version>
17+
<dapr.sdk.version>1.9.0-SNAPSHOT</dapr.sdk.version>
1818
<protobuf.output.directory>${project.build.directory}/generated-sources</protobuf.output.directory>
1919
<protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory>
2020
<grpc.version>1.42.1</grpc.version>

‎sdk/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>io.dapr</groupId>
99
<artifactId>dapr-sdk-parent</artifactId>
10-
<version>1.8.0-SNAPSHOT</version>
10+
<version>1.9.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>dapr-sdk</artifactId>
1414
<packaging>jar</packaging>
15-
<version>1.8.0-SNAPSHOT</version>
15+
<version>1.9.0-SNAPSHOT</version>
1616
<name>dapr-sdk</name>
1717
<description>SDK for Dapr</description>
1818

0 commit comments

Comments
 (0)