Update for Spring Boot 3.5.4

Author: ibmmqmet

CHANGES.md

@@ -1,8 +1,13 @@
 # Changelog
 Newest updates are at the top of this file
 
+## 3.5.4 (2025-07-28)
+- Update Spring dependencies
+- Update Testcontainers dependencies
+- Enable building against Spring Boot 4 milestone M1
+
 ## 3.5.3 (2025-06-23)
-- Update to match Spring Boot versions after their rapid reissues 
+- Update to match Spring Boot versions after their rapid reissues
 
 ## 3.5.1 (2025-06-19)
 - Update to MQ 9.4.3.0
@@ -12,14 +17,14 @@ Newest updates are at the top of this file
   - See samples/s5
 
 ## <No new version> (2025-03-06)
-- Add Narayana-based global transaction sample 
+- Add Narayana-based global transaction sample
 - Update build process in preparation for Boot 4.
 
 ## 3.4.3 (2025-02-28)
 - Update Spring dependencies
   - Samples using Atomikos not updated because of [this](https://github.com/atomikos/transactions-essentials/issues/234)
 - Update to MQ 9.4.2.0
-- Add "balancingInstanceMode" property 
+- Add "balancingInstanceMode" property
 - Simplify creation of Pooled XAConnectionFactories
 
 ## 3.3.5 (2024-10-25)

README.md

@@ -14,8 +14,9 @@ on Spring 2. Further updates will follow the Spring 3 path only. If you want to
 versions of the MQ jars, then overriding the version inherited from the mq-jms-spring-boot in your parent pom.xml should
 be possible. However, this would not give easy access via configuration to any new features available in the MQ client.
 
-NOTE: Spring Boot 4 is under development planned for release later in 2025. While this package does not currently do
-anything specific for Boot 4, the pieces are already in place to be able to build against it once it is available.
+NOTE: Spring Boot 4 is under development planned for release later in 2025. Early milestones are starting to appear.
+While this package does not currently have a formal release for Boot 4, the pieces are now in place to allow you do
+build against it: `RUNME.sh -b4` will create Boot4-compatible modules.
 
 ## Installation and Usage
 

RUNME.sh

@@ -138,7 +138,7 @@ done
 shift $((OPTIND-1))
 if [ "$1" != "" ]
 then
-  tasks=$*    
+  tasks=$*
 fi
 
 if [ -z "$bootVersions" ]
@@ -243,6 +243,10 @@ do
   fi
   (./gradlew $args --warning-mode all clean jar $target $tasks 2>&1;echo $? > $rcFile) | tee -a $buildLog
 
+  user=`cat gradle.properties | grep ossrhUsername | cut -f2 -d=`
+  pass=`cat gradle.properties | grep ossrhPassword | cut -f2 -d=`
+
+
   # Always make sure we've got a dummy properties file - the values are not needed from here on
   cp -p gradle.properties.template gradle.properties
 
@@ -277,12 +281,25 @@ done
 
 if $gaRelease
 then
+  # This is using the Staging API as the migration step to the new Sonatype interface.
+  # The upload has already happened, we are now moving the modules from the staging system
+  # to the real Central Repository, from which it can be released.
+  echo "Doing upload preparation and migration"
+
+  bearer=$(printf "$user:$pass" | base64)
+  curl --request POST \
+       --header "Authorization: Bearer $bearer" \
+       https://ossrh-staging-api.central.sonatype.com/manual/upload/defaultRepository/com.ibm.mq
+
+  echo
+
   cat << EOF
 
 The files appear to have been successfully uploaded to Maven Central.
 You now need to log on to Sonatype Nexus, and check the newly-created repository or
-repositories. There might be one for each of BOOT2, BOOT3 and BOOT4, or they might be combined in a single repo.
-If it all looks OK, then CLOSE and RELEASE the repo.
+repositories at https://central.sonatype.com/publishing/deployments.
+There might be one for each of BOOT2, BOOT3 and BOOT4, or they might be combined in a single repo.
+If it all looks OK, then PUBLISH the repo.
 
 EOF
 fi

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.3'
+  mqStarterVersion = '3.5.4'
 
   // Direct Dependencies - give versions here
-  springVersion = '6.2.8'
-  springBootVersion = '3.5.3'
+  springVersion = '6.2.9'
+  springBootVersion = '3.5.4'
 
   pooledJmsVersion = '3.1.7'
   jUnitVersion = '4.13.2'

boot4.properties

@@ -6,8 +6,8 @@ ext {
 
   // Direct Dependencies - give versions here
   // Currently placeholders until real Spring Boot 4 versions are available.
-  springVersion = '6.2.8'
-  springBootVersion = '3.5.3'
+  springVersion = '7.0.0-M7'
+  springBootVersion = '4.0.0-M1'
 
   pooledJmsVersion = '3.1.7'
   jUnitVersion = '4.13.2'

build.gradle

@@ -44,8 +44,8 @@ subprojects {
   // 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.2'
-  ext.mqTCVer = '1.21.2'
+  ext.tcVer   = '1.21.3'
+  ext.mqTCVer = '1.21.3'
 
   // The groupid for the compiled jars when uploaded
   group = mqGroup
@@ -64,9 +64,10 @@ subprojects {
 
   // Include variable debug info in the compiled classes
   compileJava.options.debugOptions.debugLevel = "source,lines,vars"
+
   // Fail on javac warnings
   if (bootVer != "boot2") {
-    compileJava.options.compilerArgs << "-Werror"
+    compileJava.options.compilerArgs << "-Werror" // << "-verbose"
   }
   task mqPrereq(type:Exec)  {
      commandLine ("../prereqCheck.sh", mqGroup, mqJar, mqVersion)
@@ -83,6 +84,13 @@ subprojects {
     targetCompatibility=javaSourceCompatibility
   }
 
+/*
+  tasks.named('jar') {
+     manifest {
+        attributes('Automatic-Module-Name': project.name)
+     }
+  }
+*/
   task sourcesJar(type: Jar, dependsOn: ['mqPrereq',classes]) {
     archiveClassifier = 'sources'
     sourceSets.all {
@@ -193,11 +201,12 @@ subprojects {
     repositories {
       maven {
         def snapshotUrl = "https://oss.sonatype.org/content/repositories/snapshots"
-        def releasesUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2"
+        // def releasesUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2"
+        def releasesUrl = "https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2"
         url = version.endsWith('SNAPSHOT') ? snapshotUrl : releasesUrl
         credentials {
-          username ossrhUsername
-          password ossrhPassword
+          username = ossrhUsername
+          password = ossrhPassword
         }
       }
     }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -26,10 +26,17 @@ fi
 mkdir $out >/dev/null 2>&1
 cd $in
 # Create the structure
-find . -type f | cpio -upad $out
+find . -type f |\
+   grep -v bin/ |\
+   cpio -upad $out
 # And recopy the Java files doing any modifications as we go
-find . -type f -name "*.java" | while read f
+find . -type f -name "*.java" |\
+ grep -v bin/ |\
+ while read f
 do
-   cp $f $out/$f 
+   # Boot4 moved a bunch of imported classes
+   cat $f |\
+   sed "s/org.springframework.boot.autoconfigure.jms/org.springframework.boot.jms.autoconfigure/g" |\
+   sed "s/org.springframework.boot.autoconfigure.transaction.jta/org.springframework.boot.transaction.jta.autoconfigure/g" > $out/$f 
 done
 

makeBoot4.sh

@@ -35,11 +35,16 @@ dependencies {
   api group: 'org.springframework',      name: 'spring-context', version: springVersion
   api group: 'org.springframework',      name: 'spring-beans',   version: springVersion
   api group: 'org.springframework',      name: 'spring-jms',     version: springVersion
-  
-  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
-  
+
+  if (!springBootVersion.startsWith("4")) {
+    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
 
   api group: 'org.messaginghub',        name: 'pooled-jms',     version: pooledJmsVersion