- Update dependencies to Spring Boot 2.7.11/3.0.6

- Over-enthusiastic conversion to Jakarta names (#91)

Author: ibmmqmet

CHANGES.md

@@ -1,6 +1,10 @@
 # Changelog
 Newest updates are at the top of this file
 
+## 2.7.11 and 3.0.6 (2023-04-21)
+- Update dependencies to Spring Boot 2.7.11/3.0.6
+- Over-enthusiastic conversion to Jakarta names (#91)
+
 ## 2.7.10 and 3.0.5 (2023-03-24)
 - Update dependencies to Spring Boot 2.7.10/3.0.5
 

jms2.properties

@@ -1,11 +1,11 @@
 // This file contains the versions of Spring etc to work with a javax.jms-based system
 ext {
   // Our shipped version - should usually match the Spring Boot Version
-  mqStarterVersion = '2.7.10'
+  mqStarterVersion = '2.7.11'
 
   // Direct Dependencies - give versions here
-  springVersion = '5.3.26'
-  springBootVersion = '2.7.10'
+  springVersion = '5.3.27'
+  springBootVersion = '2.7.11'
 
   // The pooledJms v2.x level is built against Java 11 so we can't move there
   pooledJmsVersion = '1.2.4'

jms3.properties

@@ -2,11 +2,11 @@
 ext {
   // Our shipped version - should usually match the Spring Boot Version but
   // we keep it different during the pre-GA releases
-  mqStarterVersion = '3.0.5'
+  mqStarterVersion = '3.0.6'
 
   // Direct Dependencies - give versions here
-  springVersion = '6.0.7'
-  springBootVersion = '3.0.5'
+  springVersion = '6.0.8'
+  springBootVersion = '3.0.6'
 
   pooledJmsVersion = '3.1.0'
   jUnitVersion = '4.13.2'

makeJms3.sh

@@ -12,6 +12,12 @@ curdir=`pwd`
 in="$1"
 out="$2"
 
+if [ -z "$in" -o -z "$out" ]
+then
+  echo "Usage: makeJms3.sh inDir outDir"
+  exit 1
+fi
+
 if [ ! -d $in ]
 then
   echo "Cannot find input directory $in"
@@ -28,8 +34,10 @@ do
    # Change various package names, but the javax.naming seems to have to remain so we revert that
    # specific change in the final step of the filter.
    cat  $f |\
-      sed "s/com.ibm.mq.jms/com.ibm.mq.jakarta.jms/g" |\
-      sed "s/com.ibm.msg.client/com.ibm.msg.client.jakarta/g" |\
-      sed "s/javax/jakarta/g" |
-      sed "s/jakarta.naming/javax.naming/g">  $out/$f
+      sed "s/import com.ibm.mq.jms/import com.ibm.mq.jakarta.jms/g" |\
+      sed "s/import com.ibm.msg.client/import com.ibm.msg.client.jakarta/g" |\
+      sed "s/javax/jakarta/g" |\
+      sed "s/com.ibm.mq.jakarta.jms.channel.sharing/com.ibm.mq.jms.channel.sharing/g" |\
+      sed "s/jakarta.net.ssl/javax.net.ssl/g" |\
+      sed "s/jakarta.naming/javax.naming/g" >  $out/$f
 done

samples/s1/build.gradle

@@ -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 = '2.7.10'
+ext.starterVersion = '2.7.11'
 
 // The local, flatDir configuration lets us use a modified version from
 // this repository without needing it released via maven

samples/s2.tls/build.gradle

@@ -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 = '2.7.10'
+ext.starterVersion = '2.7.11'
 
 // The local, flatDir configuration lets us use a modified version from
 // this repository without needing it released via maven

samples/s2/build.gradle

@@ -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 = '2.7.10'
+ext.starterVersion = '2.7.11'
 
 // The local, flatDir configuration lets us use a modified version from
 // this repository without needing it released via maven

samples/s3.jms3/build.gradle

@@ -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.0.5'
+ext.starterVersion = '3.0.6'
 
 
 // The local, flatDir configuration lets us use a modified version from

samples/s3/build.gradle

@@ -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 = '2.7.10'
+ext.starterVersion = '2.7.11'
 
 // The local, flatDir configuration lets us use a modified version from
 // this repository without needing it released via maven