Skip to content

Commit 841b2f8

Browse files
lony2003lony2003
authored
Merge branch 'master' into development-cloudconfig
Signed-off-by: lony2003 <35906997+lony2003@users.noreply.github.com>
2 parents 41c6110 + 42b2d88 commit 841b2f8

File tree

1,307 files changed

+31592
-41088
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,307 files changed

+31592
-41088
lines changed

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 6 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 }}
@@ -174,11 +174,11 @@ 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: |
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/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:

‎README.md‎

Lines changed: 6 additions & 6 deletions
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/dapr-spring-boot-autoconfigure/pom.xml‎

Lines changed: 8 additions & 1 deletion
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‎

Lines changed: 8 additions & 1 deletion
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‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,12 @@
5252
</dependency>
5353
</dependencies>
5454

55+
<build>
56+
<plugins>
57+
<plugin>
58+
<groupId>org.sonatype.plugins</groupId>
59+
<artifactId>nexus-staging-maven-plugin</artifactId>
60+
</plugin>
61+
</plugins>
62+
</build>
5563
</project>

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

Lines changed: 8 additions & 1 deletion
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‎

Lines changed: 8 additions & 0 deletions
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‎

Lines changed: 8 additions & 0 deletions
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‎

Lines changed: 8 additions & 0 deletions
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>

0 commit comments

Comments
 (0)