Update for Spring Boot 3.5.5

ibmmqmet · ibmmqmet · commit 1b231ca5a521 · 2025-08-27T08:52:30.000+01:00
Add sample for Boot4
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,11 @@
 # Changelog
 Newest updates are at the top of this file
 
+## 3.5.5 (2025-08-27)
+- Update Spring dependencies
+- Update Narayana dependency
+- Add samples/s6.boot4
+
 ## 3.5.4 (2025-07-28)
 - Update Spring dependencies
 - Update Testcontainers dependencies
diff --git a/boot3.properties b/boot3.properties
@@ -2,11 +2,11 @@
 ext {
   // Our shipped version - should usually match the Spring Boot Version but
   // there may be reasons to make it different
-  mqStarterVersion = '3.5.4'
+  mqStarterVersion = '3.5.5'
 
   // Direct Dependencies - give versions here
-  springVersion = '6.2.9'
-  springBootVersion = '3.5.4'
+  springVersion = '6.2.10'
+  springBootVersion = '3.5.5'
 
   pooledJmsVersion = '3.1.7'
   jUnitVersion = '4.13.2'
diff --git a/boot4.properties b/boot4.properties
@@ -2,12 +2,12 @@
 ext {
   // Our shipped version - should usually match the Spring Boot Version but
   // there may be reasons to make it different
-  mqStarterVersion = '4.0.0-M1'
+  mqStarterVersion = '4.0.0-M2'
 
   // Direct Dependencies - give versions here
   // Currently placeholders until real Spring Boot 4 versions are available.
-  springVersion = '7.0.0-M7'
-  springBootVersion = '4.0.0-M1'
+  springVersion = '7.0.0-M8'
+  springBootVersion = '4.0.0-M2'
 
   pooledJmsVersion = '3.1.7'
   jUnitVersion = '4.13.2'
diff --git a/mq-jms-spring-boot-starter/src/test/java/com/ibm/mq/spring/boot/MQConfigurationPropertiesJksTest.java b/mq-jms-spring-boot-starter/src/test/java/com/ibm/mq/spring/boot/MQConfigurationPropertiesJksTest.java
@@ -32,8 +32,8 @@
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes={MQConfigurationPropertiesJks.class})
 @TestPropertySource(properties = {
-	    "logging.level.root=TRACE",
-	    "logging.level.com.ibm.mq.spring.boot=TRACE"
+	    "logging.level.root=INFO",
+	    "logging.level.com.ibm.mq.spring.boot=INFO"
 	})
 public class MQConfigurationPropertiesJksTest {
 	
diff --git a/mq-jms-spring-boot-starter/src/test/java/com/ibm/mq/spring/boot/MQConfigurationPropertiesJndiTest.java b/mq-jms-spring-boot-starter/src/test/java/com/ibm/mq/spring/boot/MQConfigurationPropertiesJndiTest.java
@@ -32,8 +32,8 @@
 @SpringBootTest(classes={MQConfigurationPropertiesJndi.class})
 @RunWith(SpringRunner.class)
 @TestPropertySource(properties = {
-	    "logging.level.root=TRACE",
-	    "logging.level.com.ibm.mq.spring.boot=TRACE"
+	    "logging.level.root=INFO",
+	    "logging.level.com.ibm.mq.spring.boot=INFO"
 	})
 public class MQConfigurationPropertiesJndiTest {
 
diff --git a/mq-jms-spring-boot-starter/src/test/java/com/ibm/mq/spring/boot/MQConfigurationPropertiesTokenServerTest.java b/mq-jms-spring-boot-starter/src/test/java/com/ibm/mq/spring/boot/MQConfigurationPropertiesTokenServerTest.java
@@ -28,8 +28,8 @@
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes={MQConfigurationPropertiesTokenServer.class})
 @TestPropertySource(properties = {
-	    "logging.level.root=TRACE",
-	    "logging.level.com.ibm.mq.spring.boot=TRACE"
+	    "logging.level.root=INFO",
+	    "logging.level.com.ibm.mq.spring.boot=INFO"
 	})
 public class MQConfigurationPropertiesTokenServerTest {
 
diff --git a/mq-jms-spring-boot-starter/src/test/java/com/ibm/mq/spring/boot/MQPropertiesTest.java b/mq-jms-spring-boot-starter/src/test/java/com/ibm/mq/spring/boot/MQPropertiesTest.java
@@ -36,8 +36,8 @@
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes={MQAutoConfiguration.class})
 @TestPropertySource(properties = {
-	    "logging.level.root=TRACE",
-	    "logging.level.com.ibm.mq.spring.boot=TRACE"
+	    "logging.level.root=INFO",
+	    "logging.level.com.ibm.mq.spring.boot=INFO"
 	})
 @EnableAutoConfiguration
 @TestPropertySource(properties = {
diff --git a/samples/s1/build.gradle b/samples/s1/build.gradle
@@ -4,15 +4,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-	 classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.4")
+	 classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.5")
     }
 }
 
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
 
 // The designated version should match the current version in the root of the repo
-ext.starterVersion = '3.5.4'
+ext.starterVersion = '3.5.5'
 // The local, flatDir configuration lets us use a modified version from
 // this repository without needing it released via maven
 repositories {
diff --git a/samples/s2.tls/build.gradle b/samples/s2.tls/build.gradle
@@ -4,15 +4,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-	 classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.4")
+	 classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.5")
     }
 }
 
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
 
 // The designated version should match the current version in the root of the repo
-ext.starterVersion = '3.5.4'
+ext.starterVersion = '3.5.5'
 // The local, flatDir configuration lets us use a modified version from
 // this repository without needing it released via maven
 repositories {
diff --git a/samples/s2/build.gradle b/samples/s2/build.gradle
@@ -4,15 +4,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-	 classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.4")
+	 classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.5")
     }
 }
 
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot' 
 
 // The designated version should match the current version in the root of the repo
-ext.starterVersion = '3.5.4'
+ext.starterVersion = '3.5.5'
 // The local, flatDir configuration lets us use a modified version from
 // this repository without needing it released via maven
 repositories {
diff --git a/samples/s3/build.gradle b/samples/s3/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-	 classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.4")
+	 classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.5")
     }
 }
 
@@ -13,7 +13,7 @@ apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
 
 // The designated version should match the current version in the root of the repo
-ext.starterVersion = '3.5.4'
+ext.starterVersion = '3.5.5'
 
 // The local, flatDir configuration lets us use a modified version from
 // this repository without needing it released via maven
diff --git a/samples/s4/build.gradle b/samples/s4/build.gradle
@@ -4,15 +4,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-	 classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.4")
+	 classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.5")
     }
 }
 
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot' 
 
 // The designated version should match the current version in the root of the repo
-ext.starterVersion = '3.5.4'
+ext.starterVersion = '3.5.5'
 // The local, flatDir configuration lets us use a modified version from
 // this repository without needing it released via maven
 repositories {
diff --git a/samples/s4a/build.gradle b/samples/s4a/build.gradle
@@ -4,15 +4,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-	 classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.4")
+	 classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.5")
     }
 }
 
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
 
 // The designated version should match the current version in the root of the repo
-ext.starterVersion = '3.5.4'
+ext.starterVersion = '3.5.5'
 // The local, flatDir configuration lets us use a modified version from
 // this repository without needing it released via maven
 repositories {
diff --git a/samples/s4n/build.gradle b/samples/s4n/build.gradle
@@ -4,15 +4,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-	 classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.4")
+	 classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.5")
     }
 }
 
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
 
 // The designated version should match the current version in the root of the repo
-ext.starterVersion = '3.5.4'
+ext.starterVersion = '3.5.5'
 ext.narayanaVersion= '3.4.3'
 // The local, flatDir configuration lets us use a modified version from
 // this repository without needing it released via maven
diff --git a/samples/s5/build.gradle b/samples/s5/build.gradle
@@ -4,15 +4,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-	 classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.4")
+	 classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.5")
     }
 }
 
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
 
 // The designated version should match the current version in the root of the repo
-ext.starterVersion = '3.5.4'
+ext.starterVersion = '3.5.5'
 ext.mqStarterVersion = starterVersion
 ext.springBootVersion = starterVersion
 
diff --git a/samples/s6.boot4/RUNME.sh b/samples/s6.boot4/RUNME.sh
@@ -0,0 +1,20 @@
+# This script compiles and runs the sample program in this directory.
+#
+# The program puts a single message to the DEV.QUEUE.1 queue and then tries to
+# retrieve it. It uses the JmsClient classes introduced in Spring Framework 7.
+#
+# You may need to modify the application.properties file to get it to
+# connect to your queue manager.
+
+###### Cleanup from previous runs
+# Kill any old instances of the application
+ps -ef|grep gradle | grep sample6.Application | awk '{print $2}' | xargs kill -9 >/dev/null 2>&1
+
+# and try to clear the queue (assuming it's a local queue manager)
+echo "CLEAR QLOCAL(DEV.QUEUE.1)" | runmqsc -e QM1 >/dev/null 2>&1
+######
+
+# Now run the program. Build using the gradle wrapper in parent directory
+cd ../..
+
+./gradlew -p samples/s6.boot4 bootRun
diff --git a/samples/s6.boot4/build.gradle b/samples/s6.boot4/build.gradle
@@ -0,0 +1,28 @@
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+	 classpath("org.springframework.boot:spring-boot-gradle-plugin:4.0.0-M2")
+    }
+}
+
+apply plugin: 'java'
+apply plugin: 'org.springframework.boot'
+
+// The designated version should match the current version in the root of the repo
+ext.starterVersion = '4.0.0-M2'
+// The local, flatDir configuration lets us use a modified version from
+// this repository without needing it released via maven
+repositories {
+  flatDir() {
+    dirs '../../mq-jms-spring-boot-starter'
+  }
+  mavenLocal()
+  mavenCentral()
+}
+
+dependencies {
+  implementation(group:"com.ibm.mq", name:"mq-jms-spring-boot-starter",version: starterVersion)
+}
diff --git a/samples/s6.boot4/settings.gradle b/samples/s6.boot4/settings.gradle
@@ -0,0 +1,16 @@
+/*
+ * Copyright © 2017, 2020 IBM Corp. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+
+
+rootProject.name = 'mq-jms-spring-sample1'
diff --git a/samples/s6.boot4/src/main/java/sample6/Application.java b/samples/s6.boot4/src/main/java/sample6/Application.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2025 IBM Corp. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+
+// A simple example of using the JmsClient interface introduced in Spring Framework 7.
+//
+// This program connects to a queue manager, puts a message and then reads it back. It assumes
+// the queue was empty to start with.
+
+
+package sample6;
+
+import java.util.Date;
+import java.util.Optional;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.jms.annotation.EnableJms;
+import org.springframework.jms.core.JmsClient;
+import org.springframework.messaging.Message;
+
+@SpringBootApplication
+@EnableJms
+public class Application {
+
+  static final String qName = "DEV.QUEUE.1"; // A queue from the default MQ Developer container config
+
+  public static void main(String[] args) {
+
+    // Launch the application
+    ConfigurableApplicationContext context = SpringApplication.run(Application.class, args);
+    status("MQ JMS Sample using JmsClient class started.");
+
+    // Create the JmsClient object to control connections and sessions.
+    JmsClient client = context.getBean(JmsClient.class);
+
+    // Send a single message with a timestamp
+    String outMsg = "Hello from IBM MQ at " + new Date();
+
+    // This fluent approach combines several operations in one line
+    client
+       .destination(qName)
+       .send(outMsg);
+    status("Message sent to queue: " + Application.qName);
+
+    // And now try to read the message back
+    Optional<Message<?>> inMsg = client
+         .destination(qName)
+         .withReceiveTimeout(1000)
+         .receive();
+
+    String s = String.format("Message received: %s\n", (inMsg != null)?inMsg.toString():"null");
+    status(s);
+    
+    System.out.println("Done.");
+
+  }
+
+  static void status(String s) {
+    System.out.println();
+    System.out.println("========================================");
+    System.out.println(s);
+    System.out.println("========================================");
+  }
+}
diff --git a/samples/s6.boot4/src/main/resources/application.properties b/samples/s6.boot4/src/main/resources/application.properties
@@ -0,0 +1,10 @@
+
+ibm.mq.queueManager=QM1
+ibm.mq.channel=SYSTEM.DEF.SVRCONN
+ibm.mq.connName=localhost(1414)
+
+# Change the following lines as necessary. Default is no authentication
+#ibm.mq.user=mqguest
+#ibm.mq.password=passw0rd
+
+logging.level.root=WARN

Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,15 @@ buildscript {`
`4`	`4`	`mavenCentral()`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`		`- classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.4")`
	`7`	`+ classpath("org.springframework.boot:spring-boot-gradle-plugin:3.5.5")`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`apply plugin: 'java'`
`12`	`12`	`apply plugin: 'org.springframework.boot'`
`13`	`13`
`14`	`14`	`// The designated version should match the current version in the root of the repo`
`15`		`-ext.starterVersion = '3.5.4'`
	`15`	`+ext.starterVersion = '3.5.5'`
`16`	`16`	`// The local, flatDir configuration lets us use a modified version from`
`17`	`17`	`// this repository without needing it released via maven`
`18`	`18`	`repositories {`