From 4d48790bdda6bc8b8c985660676eb8b67bf05721 Mon Sep 17 00:00:00 2001
From: loadbuild <jenkins2@solace.com>
Date: Thu, 4 Jul 2024 15:48:40 -0400
Subject: [PATCH 1/4] [maven-release-plugin] prepare release 4.2.0

---
 pom.xml                                                     | 6 +++---
 solace-spring-cloud-bom/pom.xml                             | 4 ++--
 solace-spring-cloud-parent/pom.xml                          | 2 +-
 .../solace-spring-cloud-stream-starter/pom.xml              | 4 ++--
 .../solace-spring-cloud-stream-binder-core/pom.xml          | 4 ++--
 .../solace-spring-cloud-stream-binder/pom.xml               | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 680dc9be..285862e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>com.solace.spring.cloud</groupId>
     <artifactId>solace-spring-cloud-build</artifactId>
-    <version>4.2.0-SNAPSHOT</version>
+    <version>4.2.0</version>
     <packaging>pom</packaging>
 
     <name>Solace Spring Cloud Build</name>
@@ -32,7 +32,7 @@
         <!-- Remove this if the next version of solace-spring-boot works fine -->
         <spring.boot.version>3.3.1</spring.boot.version>
 
-        <solace.spring.cloud.stream-starter.version>5.2.0-SNAPSHOT</solace.spring.cloud.stream-starter.version>
+        <solace.spring.cloud.stream-starter.version>5.2.0</solace.spring.cloud.stream-starter.version>
 
         <solace.integration.test.support.version>1.0.2</solace.integration.test.support.version>
         <solace.integration.test.support.fetch_checkout.skip>false</solace.integration.test.support.fetch_checkout.skip>
@@ -73,7 +73,7 @@
         <url>https://github.com/${repoName}/solace-spring-cloud.git</url>
         <connection>scm:git:git://github.com/${repoName}/solace-spring-cloud.git</connection>
         <developerConnection>scm:git:git@github.com:${repoName}/solace-spring-cloud.git</developerConnection>
-        <tag>HEAD</tag>
+        <tag>4.2.0</tag>
     </scm>
 
     <dependencyManagement>
diff --git a/solace-spring-cloud-bom/pom.xml b/solace-spring-cloud-bom/pom.xml
index 85f44f7d..654e1dbf 100644
--- a/solace-spring-cloud-bom/pom.xml
+++ b/solace-spring-cloud-bom/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>com.solace.spring.cloud</groupId>
         <artifactId>solace-spring-cloud-build</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.2.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>solace-spring-cloud-bom</artifactId>
     <packaging>pom</packaging>
-    <version>4.2.0-SNAPSHOT</version>
+    <version>4.2.0</version>
 
     <name>Solace Spring Cloud BOM</name>
     <description>BOM for Solace Spring Cloud</description>
diff --git a/solace-spring-cloud-parent/pom.xml b/solace-spring-cloud-parent/pom.xml
index 97d3de32..a2e20116 100644
--- a/solace-spring-cloud-parent/pom.xml
+++ b/solace-spring-cloud-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.solace.spring.cloud</groupId>
         <artifactId>solace-spring-cloud-build</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.2.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/solace-spring-cloud-starters/solace-spring-cloud-stream-starter/pom.xml b/solace-spring-cloud-starters/solace-spring-cloud-stream-starter/pom.xml
index 1a779501..51da172f 100644
--- a/solace-spring-cloud-starters/solace-spring-cloud-stream-starter/pom.xml
+++ b/solace-spring-cloud-starters/solace-spring-cloud-stream-starter/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>com.solace.spring.cloud</groupId>
         <artifactId>solace-spring-cloud-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.2.0</version>
         <relativePath>../../solace-spring-cloud-parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>spring-cloud-starter-stream-solace</artifactId>
-    <version>5.2.0-SNAPSHOT</version>
+    <version>5.2.0</version>
     <packaging>jar</packaging>
 
 
diff --git a/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder-core/pom.xml b/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder-core/pom.xml
index 0a5d208c..c0f44fb7 100644
--- a/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder-core/pom.xml
+++ b/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder-core/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>com.solace.spring.cloud</groupId>
         <artifactId>solace-spring-cloud-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.2.0</version>
         <relativePath>../../solace-spring-cloud-parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>spring-cloud-stream-binder-solace-core</artifactId>
-    <version>5.2.0-SNAPSHOT</version>
+    <version>5.2.0</version>
     <packaging>jar</packaging>
 
     <name>Solace Spring Cloud Stream Binder Core</name>
diff --git a/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder/pom.xml b/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder/pom.xml
index 9cd87b6f..fc7f92e5 100644
--- a/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder/pom.xml
+++ b/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>com.solace.spring.cloud</groupId>
         <artifactId>solace-spring-cloud-parent</artifactId>
-        <version>4.2.0-SNAPSHOT</version>
+        <version>4.2.0</version>
         <relativePath>../../solace-spring-cloud-parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>spring-cloud-stream-binder-solace</artifactId>
-    <version>5.2.0-SNAPSHOT</version>
+    <version>5.2.0</version>
     <packaging>jar</packaging>
 
     <name>Solace Spring Cloud Stream Binder</name>

From 49c32c72ec29194f9727de08680811bff869a360 Mon Sep 17 00:00:00 2001
From: loadbuild <jenkins2@solace.com>
Date: Thu, 4 Jul 2024 15:48:42 -0400
Subject: [PATCH 2/4] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml                                                     | 6 +++---
 solace-spring-cloud-bom/pom.xml                             | 4 ++--
 solace-spring-cloud-parent/pom.xml                          | 2 +-
 .../solace-spring-cloud-stream-starter/pom.xml              | 4 ++--
 .../solace-spring-cloud-stream-binder-core/pom.xml          | 4 ++--
 .../solace-spring-cloud-stream-binder/pom.xml               | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 285862e4..58d9e6ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>com.solace.spring.cloud</groupId>
     <artifactId>solace-spring-cloud-build</artifactId>
-    <version>4.2.0</version>
+    <version>4.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Solace Spring Cloud Build</name>
@@ -32,7 +32,7 @@
         <!-- Remove this if the next version of solace-spring-boot works fine -->
         <spring.boot.version>3.3.1</spring.boot.version>
 
-        <solace.spring.cloud.stream-starter.version>5.2.0</solace.spring.cloud.stream-starter.version>
+        <solace.spring.cloud.stream-starter.version>5.2.1-SNAPSHOT</solace.spring.cloud.stream-starter.version>
 
         <solace.integration.test.support.version>1.0.2</solace.integration.test.support.version>
         <solace.integration.test.support.fetch_checkout.skip>false</solace.integration.test.support.fetch_checkout.skip>
@@ -73,7 +73,7 @@
         <url>https://github.com/${repoName}/solace-spring-cloud.git</url>
         <connection>scm:git:git://github.com/${repoName}/solace-spring-cloud.git</connection>
         <developerConnection>scm:git:git@github.com:${repoName}/solace-spring-cloud.git</developerConnection>
-        <tag>4.2.0</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <dependencyManagement>
diff --git a/solace-spring-cloud-bom/pom.xml b/solace-spring-cloud-bom/pom.xml
index 654e1dbf..6ae493fa 100644
--- a/solace-spring-cloud-bom/pom.xml
+++ b/solace-spring-cloud-bom/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>com.solace.spring.cloud</groupId>
         <artifactId>solace-spring-cloud-build</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>solace-spring-cloud-bom</artifactId>
     <packaging>pom</packaging>
-    <version>4.2.0</version>
+    <version>4.2.1-SNAPSHOT</version>
 
     <name>Solace Spring Cloud BOM</name>
     <description>BOM for Solace Spring Cloud</description>
diff --git a/solace-spring-cloud-parent/pom.xml b/solace-spring-cloud-parent/pom.xml
index a2e20116..ba8260d7 100644
--- a/solace-spring-cloud-parent/pom.xml
+++ b/solace-spring-cloud-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.solace.spring.cloud</groupId>
         <artifactId>solace-spring-cloud-build</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/solace-spring-cloud-starters/solace-spring-cloud-stream-starter/pom.xml b/solace-spring-cloud-starters/solace-spring-cloud-stream-starter/pom.xml
index 51da172f..19086828 100644
--- a/solace-spring-cloud-starters/solace-spring-cloud-stream-starter/pom.xml
+++ b/solace-spring-cloud-starters/solace-spring-cloud-stream-starter/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>com.solace.spring.cloud</groupId>
         <artifactId>solace-spring-cloud-parent</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1-SNAPSHOT</version>
         <relativePath>../../solace-spring-cloud-parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>spring-cloud-starter-stream-solace</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 
diff --git a/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder-core/pom.xml b/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder-core/pom.xml
index c0f44fb7..1219b38c 100644
--- a/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder-core/pom.xml
+++ b/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder-core/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>com.solace.spring.cloud</groupId>
         <artifactId>solace-spring-cloud-parent</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1-SNAPSHOT</version>
         <relativePath>../../solace-spring-cloud-parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>spring-cloud-stream-binder-solace-core</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Solace Spring Cloud Stream Binder Core</name>
diff --git a/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder/pom.xml b/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder/pom.xml
index fc7f92e5..60a8c1a5 100644
--- a/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder/pom.xml
+++ b/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>com.solace.spring.cloud</groupId>
         <artifactId>solace-spring-cloud-parent</artifactId>
-        <version>4.2.0</version>
+        <version>4.2.1-SNAPSHOT</version>
         <relativePath>../../solace-spring-cloud-parent/pom.xml</relativePath>
     </parent>
 
     <artifactId>spring-cloud-stream-binder-solace</artifactId>
-    <version>5.2.0</version>
+    <version>5.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Solace Spring Cloud Stream Binder</name>

From 085a3dae6c9f5d1be273943a921e30a47df4fd3a Mon Sep 17 00:00:00 2001
From: Jeffrey D <11084623+Nephery@users.noreply.github.com>
Date: Mon, 8 Jul 2024 13:56:29 -0400
Subject: [PATCH 3/4] change JUnit parallelism to fixed with upper limit (#308)

---
 .../src/test/resources/junit-platform.properties          | 8 ++++++++
 .../src/test/resources/junit-platform.properties          | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder-core/src/test/resources/junit-platform.properties b/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder-core/src/test/resources/junit-platform.properties
index 49eb0746..abef3962 100644
--- a/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder-core/src/test/resources/junit-platform.properties
+++ b/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder-core/src/test/resources/junit-platform.properties
@@ -3,5 +3,13 @@ junit.jupiter.extensions.autodetection.enabled=true
 # Parallel test execution is disabled by default for easy debugging in IDEs.
 # It is overridden to be enabled by the Maven Surefire/Failsafe plugins.
 junit.jupiter.execution.parallel.enabled=false
+
+# Configured based on Github-hosted runners for public repositories.
+# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
+junit.jupiter.execution.parallel.config.strategy=fixed
+# Parallelism should ideally equal to the num of processors on the machine
+junit.jupiter.execution.parallel.config.fixed.parallelism=4
+junit.jupiter.execution.parallel.config.fixed.max-pool-size=20
+
 junit.jupiter.execution.parallel.mode.default=concurrent
 junit.jupiter.execution.parallel.mode.classes.default=concurrent
diff --git a/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder/src/test/resources/junit-platform.properties b/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder/src/test/resources/junit-platform.properties
index 23145bf3..4373ea2f 100644
--- a/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder/src/test/resources/junit-platform.properties
+++ b/solace-spring-cloud-stream-binder/solace-spring-cloud-stream-binder/src/test/resources/junit-platform.properties
@@ -3,5 +3,13 @@ junit.jupiter.extensions.autodetection.enabled=true
 # Parallel test execution is disabled by default for easy debugging in IDEs.
 # It is overridden to be enabled by the Maven Surefire/Failsafe plugins.
 junit.jupiter.execution.parallel.enabled=false
+
+# Configured based on Github-hosted runners for public repositories.
+# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
+junit.jupiter.execution.parallel.config.strategy=fixed
+# Parallelism should ideally equal to the num of processors on the machine
+junit.jupiter.execution.parallel.config.fixed.parallelism=4
+junit.jupiter.execution.parallel.config.fixed.max-pool-size=20
+
 junit.jupiter.execution.parallel.mode.default=concurrent
 junit.jupiter.execution.parallel.mode.classes.default=same_thread

From ae1c4348d6795c37a7af0722cb843e6be926ab3a Mon Sep 17 00:00:00 2001
From: Jeffrey D <11084623+Nephery@users.noreply.github.com>
Date: Mon, 8 Jul 2024 13:56:47 -0400
Subject: [PATCH 4/4] update snapshot workflow to build from master (#309)

---
 .github/workflows/snapshot-release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/snapshot-release.yml b/.github/workflows/snapshot-release.yml
index 2d1cc68f..d5b6141a 100644
--- a/.github/workflows/snapshot-release.yml
+++ b/.github/workflows/snapshot-release.yml
@@ -5,7 +5,7 @@ on:
     workflows:
       - Test
     branches:
-      - 'stage-*'
+      - master
     types:
       - completed