Skip to content

Commit cc537a4

Browse files
artur-ciocanuArtur Ciocanu
and
Artur Ciocanu
authored
Adding Maven Profiles (dapr#1120)
* Adding Maven Profiles Signed-off-by: Artur Ciocanu <[email protected]> * Simplify profiles setup Signed-off-by: Artur Ciocanu <[email protected]> --------- Signed-off-by: Artur Ciocanu <[email protected]> Co-authored-by: Artur Ciocanu <[email protected]>
1 parent 4b83da6 commit cc537a4

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
run: ./mvnw install -q -B -DskipTests
120120
- name: Integration tests using spring boot version ${{ matrix.spring-boot-version }}
121121
id: integration_tests
122-
run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} ./mvnw -B -f sdk-tests/pom.xml verify
122+
run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} ./mvnw -B -Pintegration-tests verify
123123
- name: Upload test report for sdk
124124
uses: actions/upload-artifact@v4
125125
with:

pom.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,15 @@
328328
<module>examples</module>
329329
<!-- We are following test containers artifact convention on purpose, don't rename -->
330330
<module>testcontainers-dapr</module>
331-
<!-- don't add sdk-tests to the build,
332-
it's only used for CI testing by github action
333-
<module>sdk-tests</module>
334-
-->
335331
</modules>
336332

333+
<profiles>
334+
<profile>
335+
<id>integration-tests</id>
336+
<modules>
337+
<module>sdk-tests</module>
338+
</modules>
339+
</profile>
340+
</profiles>
341+
337342
</project>

sdk-tests/pom.xml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>io.dapr</groupId>
7+
<parent>
8+
<groupId>io.dapr</groupId>
9+
<artifactId>dapr-sdk-parent</artifactId>
10+
<version>1.13.0-SNAPSHOT</version>
11+
</parent>
12+
813
<artifactId>dapr-sdk-tests</artifactId>
9-
<version>0.0.0-SNAPSHOT</version>
14+
<version>1.13.0-SNAPSHOT</version>
1015
<name>dapr-sdk-tests</name>
1116
<description>Tests for Dapr's Java SDK - not to be published as a jar.</description>
1217

@@ -320,15 +325,6 @@
320325
<properties>
321326
<springboot.version>${env.PRODUCT_SPRING_BOOT_VERSION}</springboot.version>
322327
</properties>
323-
<dependencies>
324-
<dependency>
325-
<!-- Needed for dapr compatibility for spring boot versions before 2.7 -->
326-
<groupId>com.squareup.okhttp3</groupId>
327-
<artifactId>okhttp</artifactId>
328-
<version>4.9.0</version>
329-
<scope>test</scope>
330-
</dependency>
331-
</dependencies>
332328
</profile>
333329
</profiles>
334330
</project>

0 commit comments

Comments
 (0)