From 263a551177cfedc5874339c76f00356d1c4ea77f Mon Sep 17 00:00:00 2001
From: Artur Ciocanu <ciocanu@adobe.com>
Date: Thu, 5 Sep 2024 17:08:28 +0300
Subject: [PATCH 1/2] Adding Maven Profiles

Signed-off-by: Artur Ciocanu <ciocanu@adobe.com>
---
 .github/workflows/build.yml |  2 +-
 pom.xml                     | 40 +++++++++++++++++++++++--------------
 sdk-tests/pom.xml           | 18 +++++++----------
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ac3d084ee..070f163dc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -119,7 +119,7 @@ jobs:
       run: ./mvnw install -q -B -DskipTests
     - name: Integration tests using spring boot version ${{ matrix.spring-boot-version }}
       id: integration_tests
-      run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} ./mvnw -B -f sdk-tests/pom.xml verify
+      run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} ./mvnw -B -Pintegration-tests verify
     - name: Upload test report for sdk
       uses: actions/upload-artifact@v4
       with:
diff --git a/pom.xml b/pom.xml
index 946c5f2e4..b89963125 100644
--- a/pom.xml
+++ b/pom.xml
@@ -318,20 +318,30 @@
     <tag>HEAD</tag>
   </scm>
 
-  <modules>
-    <module>sdk-autogen</module>
-    <module>sdk</module>
-    <module>sdk-actors</module>
-    <module>sdk-workflows</module>
-    <module>sdk-springboot</module>
-    <module>dapr-spring</module>
-    <module>examples</module>
-    <!-- We are following test containers artifact convention on purpose, don't rename -->
-    <module>testcontainers-dapr</module>
-    <!-- don't add sdk-tests to the build, 
-      it's only used for CI testing by github action
-    <module>sdk-tests</module>
-    -->
-  </modules>
+  <profiles>
+    <profile>
+      <id>default</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
+        <module>sdk-autogen</module>
+        <module>sdk</module>
+        <module>sdk-actors</module>
+        <module>sdk-workflows</module>
+        <module>sdk-springboot</module>
+        <module>dapr-spring</module>
+        <module>examples</module>
+        <!-- We are following test containers artifact convention on purpose, don't rename -->
+        <module>testcontainers-dapr</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>integration-tests</id>
+      <modules>
+        <module>sdk-tests</module>
+      </modules>
+    </profile>
+  </profiles>
 
 </project>
diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml
index 7c4997024..ce60ce241 100644
--- a/sdk-tests/pom.xml
+++ b/sdk-tests/pom.xml
@@ -4,9 +4,14 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>io.dapr</groupId>
+  <parent>
+    <groupId>io.dapr</groupId>
+    <artifactId>dapr-sdk-parent</artifactId>
+    <version>1.13.0-SNAPSHOT</version>
+  </parent>
+
   <artifactId>dapr-sdk-tests</artifactId>
-  <version>0.0.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <name>dapr-sdk-tests</name>
   <description>Tests for Dapr's Java SDK - not to be published as a jar.</description>
 
@@ -320,15 +325,6 @@
       <properties>
         <springboot.version>${env.PRODUCT_SPRING_BOOT_VERSION}</springboot.version>
       </properties>
-      <dependencies>
-        <dependency>
-          <!-- Needed for dapr compatibility for spring boot versions before 2.7 -->
-          <groupId>com.squareup.okhttp3</groupId>
-          <artifactId>okhttp</artifactId>
-          <version>4.9.0</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
     </profile>
   </profiles>
 </project>

From b382505ccfc95e50ccd04cd726451c552606e78f Mon Sep 17 00:00:00 2001
From: Artur Ciocanu <ciocanu@adobe.com>
Date: Fri, 6 Sep 2024 10:18:01 +0300
Subject: [PATCH 2/2] Simplify profiles setup

Signed-off-by: Artur Ciocanu <ciocanu@adobe.com>
---
 pom.xml | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index b89963125..c8cf9699c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -318,24 +318,19 @@
     <tag>HEAD</tag>
   </scm>
 
+  <modules>
+    <module>sdk-autogen</module>
+    <module>sdk</module>
+    <module>sdk-actors</module>
+    <module>sdk-workflows</module>
+    <module>sdk-springboot</module>
+    <module>dapr-spring</module>
+    <module>examples</module>
+    <!-- We are following test containers artifact convention on purpose, don't rename -->
+    <module>testcontainers-dapr</module>
+  </modules>
+
   <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <modules>
-        <module>sdk-autogen</module>
-        <module>sdk</module>
-        <module>sdk-actors</module>
-        <module>sdk-workflows</module>
-        <module>sdk-springboot</module>
-        <module>dapr-spring</module>
-        <module>examples</module>
-        <!-- We are following test containers artifact convention on purpose, don't rename -->
-        <module>testcontainers-dapr</module>
-      </modules>
-    </profile>
     <profile>
       <id>integration-tests</id>
       <modules>