Merge remote-tracking branch 'refs/remotes/origin/master' into DATAGO…

…-79228
SolaceDev · Jul 16, 2024 · 3703872 · 3703872
2 parents 60f2f5c + ae1c434
commit 3703872
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 12 deletions.
diff --git a/.github/workflows/snapshot-release.yml b/.github/workflows/snapshot-release.yml
@@ -5,7 +5,7 @@ on:
     workflows:
       - Test
     branches:
-      - 'stage-*'
+      - master
     types:
       - completed
 

diff --git 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.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-SNAPSHOT</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.1.2</solace.integration.test.support.version>
         <solace.integration.test.support.fetch_checkout.skip>false</solace.integration.test.support.fetch_checkout.skip>

diff --git 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.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>solace-spring-cloud-bom</artifactId>
     <packaging>pom</packaging>
-    <version>4.2.0-SNAPSHOT</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
@@ -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.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
@@ -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.1-SNAPSHOT</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.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
@@ -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.1-SNAPSHOT</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.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Solace Spring Cloud Stream Binder Core</name>

diff --git a/...inder/solace-spring-cloud-stream-binder-core/src/test/resources/junit-platform.properties b/...inder/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/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.1-SNAPSHOT</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.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Solace Spring Cloud Stream Binder</name>

diff --git a/...eam-binder/solace-spring-cloud-stream-binder/src/test/resources/junit-platform.properties b/...eam-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