Update for MQ 9.4.4

Author: ibmmqmet

CHANGES.md

@@ -1,6 +1,12 @@
 # Changelog
 Newest updates are at the top of this file
 
+## 3.5.7 (2025-10-23)
+- Update to MQ 9.4.4.0
+- Update Spring dependencies
+- Update Testcontainer dependency to V2.0.1
+  - Change samples/s5/build.gradle to ensure gradle can run tests
+
 ## 3.5.5 (2025-08-27)
 - Update Spring dependencies
 - Update Narayana dependency

README.md

@@ -451,6 +451,8 @@ This package is provided as-is with no guarantees of support or updates. You can
 future versions of the package; the API is subject to change based on any feedback. Versioned releases are made to
 assist with using stable APIs.
 
+This does not affect the status of the underlying MQ Java client libraries which have their own support conditions.
+
 ### Issues
 
 Before opening a new issue please consider the following:

RUNME.sh

@@ -26,14 +26,15 @@
 
 function printSyntax {
   cat << EOF
-Usage: RUNME.sh [-b bootVersion] [-c] [-k] [-n] [-r]
+Usage: RUNME.sh [-b bootVersion] [-c] [-k] [-n] [-p] [-r]
 Options:
    -b Spring Boot Version ("boot2", "boot3" or "boot4"): can be repeated to get combinations.
       Default builds boot3 only.
    -c Build the Testcontainer module. Do not set this if building for Maven publication and
       the version number has not changed.
    -k Keep artifacts built previously at a different version
    -n Do not sign the generated artifacts for local builds
+   -p Check prereqs for local builds (always done for release builds)
    -r Release to Maven staging or snapshot area
 Note that after pushing files to the STAGING area they will
 still require a manual release.
@@ -97,7 +98,7 @@ chmod +x makeBoot*.sh
 # git seems to lose permissions for this one sometimes so force it
 chmod +x prereqCheck.sh
 
-while getopts :b:cjknr o
+while getopts :b:cjknpr o
 do
   case $o in
   b)
@@ -124,7 +125,9 @@ do
     deleteArtifacts=false
     ;;
   n) export NOSIGN=true
-      ;;
+     ;;
+  p) export prereqCheck=true
+     ;;
   r)
     gaRelease=true
     ;;
@@ -269,7 +272,7 @@ do
 done
 
 # And see what we've created - this was useful debug during devt of the build scripts
-find . -newer $timeStamp -type f -name "mq*.jar" -ls
+find . -newer $timeStamp -type f -name "mq*.jar" -ls | grep -v javadoc | grep -v sources
 #find $curdir/mq-jms*-boot-starter/build -name "*.asc"
 #find $HOME/.gradle/ $HOME/.m2 -type f -ls | grep mq-jms-spring
 #find $HOME/.gradle/ $HOME/.m2 -name "$strProject.*.pom" | xargs more

allConstants.txt

@@ -553,4 +553,4 @@ are the only type that might be used for a CF configuration property.
   public static final String XMSC_MESSAGE_BUFFER = "XMSC_MESSAGE_BUFFER";
   public static final String XMSC_MESSAGE_ID = "XMSC_MESSAGE_ID";
   public static final String XMSC_SUBSCRIBER_Q_NAME = "XMSC_SUBSCRIBER_Q_NAME";
-CMQC.java: * Build Level:   p943-L250417                                
+CMQC.java: * Build Level:   p944-L250905                                

boot3.properties

@@ -2,14 +2,14 @@
 ext {
   // Our shipped version - should usually match the Spring Boot Version but
   // there may be reasons to make it different
-  mqStarterVersion = '3.5.5'
+  mqStarterVersion = '3.5.7'
 
   // Direct Dependencies - give versions here
-  springVersion = '6.2.10'
-  springBootVersion = '3.5.5'
+  springVersion = '6.2.12'
+  springBootVersion = '3.5.7'
 
   pooledJmsVersion = '3.1.7'
-  jUnitVersion = '4.13.2'
+  jUnitVersion = '5.14.0'
 
   // MQ client has a 'jakarta' name
   mqJar = 'com.ibm.mq.jakarta.client'

boot4.properties

@@ -2,15 +2,15 @@
 ext {
   // Our shipped version - should usually match the Spring Boot Version but
   // there may be reasons to make it different
-  mqStarterVersion = '4.0.0-M2'
+  mqStarterVersion = '4.0.0-RC1'
 
   // Direct Dependencies - give versions here
   // Currently placeholders until real Spring Boot 4 versions are available.
-  springVersion = '7.0.0-M8'
-  springBootVersion = '4.0.0-M2'
+  springVersion = '7.0.0-RC2'
+  springBootVersion = '4.0.0-RC1'
 
   pooledJmsVersion = '3.1.7'
-  jUnitVersion = '4.13.2'
+  jUnitVersion = '5.14.0'
 
   // MQ client has a 'jakarta' name
   mqJar = 'com.ibm.mq.jakarta.client'

build.gradle

@@ -37,15 +37,15 @@ subprojects {
   apply plugin: 'signing'
 
   // This is the MQ client version
-  ext.mqVersion = '9.4.3.0'
+  ext.mqVersion = '9.4.4.0'
   ext.mqGroup = 'com.ibm.mq'
 
   // This is the testcontainers base jar version - these should match the current org.testcontainers level
   // It's only built once, so we don't need to put the MQ-specific module in one of the version properties.
   // The MQ version ought to match the base version, but it's not an absolute requirement so we split the
   // properties.
-  ext.tcVer   = '1.21.3'
-  ext.mqTCVer = '1.21.3'
+  ext.tcVer   = '2.0.1'
+  ext.mqTCVer = '2.0.1'
 
   // The groupid for the compiled jars when uploaded
   group = mqGroup
@@ -59,7 +59,7 @@ subprojects {
   }
 
   dependencies {
-    // Now live in the underlying project's build.gradle files
+    // Now live in the underlying project's build.gradle files 
   }  
 
   // Include variable debug info in the compiled classes

makeBoot4.sh

@@ -2,9 +2,6 @@
 
 # Generate a Boot4-compatible source from the primary tree (JMS3/Boot3):
 #
-# This is just a skeleton until we understand what - if any - changes
-# are needed to move from Boot3 to Boot4. For now, the Boot3 tree is 
-# simply copied unmodified.
 
 curdir=`pwd`
 in="$1"

mq-jms-spring-boot-starter/build.gradle

@@ -42,13 +42,13 @@ dependencies {
   api group: 'org.springframework',      name: 'spring-beans',   version: springVersion
   api group: 'org.springframework',      name: 'spring-jms',     version: springVersion
 
-  if (!springBootVersion.startsWith("4")) {
+  if (springBootVersion.startsWith("4")) {
+    api group: 'org.springframework.boot', name: 'spring-boot-starter-jms', version: springBootVersion
+    api group: 'org.springframework.boot', name: 'spring-boot-transaction', version: springBootVersion
+  } else {
     api group: 'org.springframework.boot', name: 'spring-boot-starter', version: springBootVersion
     api group: 'org.springframework.boot', name: 'spring-boot', version: springBootVersion
     api group: 'org.springframework.boot', name: 'spring-boot-autoconfigure', version: springBootVersion
-  } else {
-    api group: 'org.springframework.boot', name: 'spring-boot-starter-jms', version: springBootVersion
-    api group: 'org.springframework.boot', name: 'spring-boot-tx', version: springBootVersion
   }
 
   annotationProcessor group:'org.springframework.boot', name:'spring-boot-configuration-processor', version: springBootVersion
@@ -58,7 +58,7 @@ dependencies {
   // Testing - these are not put into the pom.xml describing our uploaded jars
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springBootVersion
   testImplementation group: 'org.mockito', name:'mockito-core', version: mockitoVersion
-  
+
   // Setting up the dependencies needed for JUnit5 testing
   testImplementation group:'org.junit.jupiter', name:'junit-jupiter-api',    version: jUnitVersion
   testRuntimeOnly    group:'org.junit.jupiter', name:'junit-jupiter-engine', version: jUnitVersion
@@ -83,6 +83,6 @@ tasks.test {
   testLogging {
        //events "PASSED", "SKIPPED", "FAILED", "STANDARD_OUT", "STANDARD_ERROR"
        events "PASSED", "SKIPPED", "FAILED"
-      
+
   }
 }