Skip to content

Commit 5383fae

Browse files
artur-ciocanuartur-ciocanu
authored
Merge branch 'master' into update_to_115
2 parents c1b9665 + 18a036c commit 5383fae

File tree

23 files changed

+205
-104
lines changed

23 files changed

+205
-104
lines changed

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -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

+9-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.14.0-SNAPSHOT</version>
9+
<version>0.15.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>dapr-spring-boot-autoconfigure</artifactId>
@@ -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

+9-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.14.0-SNAPSHOT</version>
9+
<version>0.15.0-SNAPSHOT</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

@@ -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

+9-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.14.0-SNAPSHOT</version>
9+
<version>0.15.0-SNAPSHOT</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

@@ -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

+9-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.14.0-SNAPSHOT</version>
9+
<version>0.15.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>dapr-spring-boot-tests</artifactId>
@@ -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

+9-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.14.0-SNAPSHOT</version>
9+
<version>0.15.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>dapr-spring-data</artifactId>
@@ -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

+9-1
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,20 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.14.0-SNAPSHOT</version>
9+
<version>0.15.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>dapr-spring-messaging</artifactId>
1313
<name>dapr-spring-messaging</name>
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

+9-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.14.0-SNAPSHOT</version>
9+
<version>0.15.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>dapr-spring-workflows</artifactId>
@@ -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

+6-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<parent>
88
<groupId>io.dapr</groupId>
99
<artifactId>dapr-sdk-parent</artifactId>
10-
<version>1.14.0-SNAPSHOT</version>
10+
<version>1.15.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<groupId>io.dapr.spring</groupId>
1414
<artifactId>dapr-spring-parent</artifactId>
1515
<packaging>pom</packaging>
16-
<version>0.14.0-SNAPSHOT</version>
16+
<version>0.15.0-SNAPSHOT</version>
1717
<name>dapr-spring-parent</name>
1818
<description>SDK extension for Spring and Spring Boot</description>
1919

@@ -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

+2-11
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.14.0-SNAPSHOT</version>
10+
<version>1.15.0-SNAPSHOT</version>
1111
</parent>
1212

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

1818
<properties>
@@ -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>
@@ -184,14 +183,6 @@
184183
<release>${java.version}</release>
185184
</configuration>
186185
</plugin>
187-
<plugin>
188-
<groupId>org.apache.maven.plugins</groupId>
189-
<artifactId>maven-deploy-plugin</artifactId>
190-
<version>${maven-deploy-plugin.version}</version>
191-
<configuration>
192-
<skip>true</skip>
193-
</configuration>
194-
</plugin>
195186
<plugin>
196187
<groupId>org.apache.maven.plugins</groupId>
197188
<artifactId>maven-site-plugin</artifactId>

‎pom.xml

+15-17
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.14.0-SNAPSHOT</version>
10+
<version>1.15.0-SNAPSHOT</version>
1111
<name>dapr-sdk-parent</name>
1212
<description>SDK for Dapr.</description>
1313
<url>https://dapr.io</url>
@@ -18,8 +18,8 @@
1818
<protobuf.version>3.25.5</protobuf.version>
1919
<protocCommand>protoc</protocCommand>
2020
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.14.4/dapr/proto</dapr.proto.baseurl>
21-
<dapr.sdk.version>1.14.0-SNAPSHOT</dapr.sdk.version>
22-
<dapr.sdk.alpha.version>0.14.0-SNAPSHOT</dapr.sdk.alpha.version>
21+
<dapr.sdk.version>1.15.0-SNAPSHOT</dapr.sdk.version>
22+
<dapr.sdk.alpha.version>0.15.0-SNAPSHOT</dapr.sdk.alpha.version>
2323
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
2424
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
2525
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
@@ -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,20 @@
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+
</plugin>
165172
</plugins>
166173
</pluginManagement>
167-
168174
<plugins>
175+
<plugin>
176+
<groupId>org.sonatype.plugins</groupId>
177+
<artifactId>nexus-staging-maven-plugin</artifactId>
178+
<inherited>false</inherited>
179+
</plugin>
169180
<plugin>
170181
<groupId>org.jacoco</groupId>
171182
<artifactId>jacoco-maven-plugin</artifactId>
@@ -343,19 +354,6 @@
343354
</modules>
344355

345356
<profiles>
346-
<profile>
347-
<id>deploy-profile</id>
348-
<modules>
349-
<!-- Include only the modules to be deployed -->
350-
<module>sdk-autogen</module>
351-
<module>sdk</module>
352-
<module>sdk-actors</module>
353-
<module>sdk-springboot</module>
354-
<module>sdk-workflows</module>
355-
<module>testcontainers-dapr</module>
356-
<module>dapr-spring</module>
357-
</modules>
358-
</profile>
359357
<profile>
360358
<id>integration-tests</id>
361359
<modules>

‎sdk-actors/pom.xml

+6-2
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.14.0-SNAPSHOT</version>
10+
<version>1.15.0-SNAPSHOT</version>
1111
</parent>
1212

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

@@ -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

+6-2
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.14.0-SNAPSHOT</version>
10+
<version>1.15.0-SNAPSHOT</version>
1111
</parent>
1212

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

@@ -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>

0 commit comments

Comments
 (0)