Update for MQ 9.3.2

ibm-messaging · Feb 24, 2023 · fa8bf8d · fa8bf8d
1 parent e4c2df2
commit fa8bf8d
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 12 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,11 @@
 # Changelog
 Newest updates are at the top of this file
 
+## 2.7.9 and 3.0.3 (2023-02-23)
+- Update dependencies to Spring Boot 2.7.9/3.0.3
+- Update dependencies to MQ 9.3.2.0
+- Add channel.sharing configuration property
+
 ## 2.7.8 and 3.0.2 (2023-01-20)
 - Update dependencies to Spring Boot 2.7.8/3.0.2
 - Add script to create JKS file for sample t2.tls

diff --git a/README.md b/README.md
@@ -174,6 +174,7 @@ The following options all default to null, but may be used to assist with config
 | ibm.mq.sslPeerName          | Peer Name,    sets connectionFactory property WMQConstants.WMQ_SSL_PEER_NAME    |
 | ibm.mq.useIBMCipherMappings | Sets System property com.ibm.mq.cfg.useIBMCipherMappings                        |
 | ibm.mq.outboundSNI          | Sets property com.ibm.mq.cfg.SSL.OutboundSNI (use HOSTNAME for Openshift qmgrs) |
+| ibm.mq.channelSharing       | Sets strategy for TCP/IP connection sharing - CONNECTION or GLOBAL              |
 
 We also have
 

diff --git a/build.gradle b/build.gradle
@@ -37,7 +37,7 @@ subprojects {
   apply plugin: 'signing'
 
   // This is the MQ client version
-  ext.mqVersion = '9.3.1.0'
+  ext.mqVersion = '9.3.2.0'
   ext.mqGroup = 'com.ibm.mq'
 
   // The groupid for the compiled jars when uploaded

diff --git a/jms2.properties b/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.8'
+  mqStarterVersion = '2.7.9'
 
   // Direct Dependencies - give versions here
   springVersion = '5.3.25'
-  springBootVersion = '2.7.8'
+  springBootVersion = '2.7.9'
 
   // The pooledJms v2.x level is built against Java 11 so we can't move there
   pooledJmsVersion = '1.2.4'

diff --git a/jms3.properties b/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.2'
+  mqStarterVersion = '3.0.3'
 
   // Direct Dependencies - give versions here
-  springVersion = '6.0.4'
-  springBootVersion = '3.0.2'
+  springVersion = '6.0.5'
+  springBootVersion = '3.0.3'
 
   pooledJmsVersion = '3.1.0'
   jUnitVersion = '4.13.2'

diff --git a/...s-spring-boot-starter/src/main/java/com/ibm/mq/spring/boot/MQConfigurationProperties.java b/...s-spring-boot-starter/src/main/java/com/ibm/mq/spring/boot/MQConfigurationProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018,2021 IBM Corp. All rights reserved.
+ * Copyright © 2018,2023 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
@@ -54,6 +54,7 @@ public class MQConfigurationProperties {
   // affect how connections are made.
   private static final String PROPERTY_USE_IBM_CIPHER_MAPPINGS = "com.ibm.mq.cfg.useIBMCipherMappings";
   private static final String PROPERTY_OUTBOUND_SNI            = "com.ibm.mq.cfg.SSL.outboundSNI";
+  private static final String PROPERTY_CHANNEL_SHARING         = "com.ibm.mq.jms.channel.sharing";
 
   /**
    * MQ Queue Manager name
@@ -140,6 +141,11 @@ public class MQConfigurationProperties {
    */
   private String outboundSNI = ""; // HOSTNAME or CHANNEL are the valid alternatives
 
+  /**
+   * Set to GLOBAL or CONNECTION for strategies to share TCP/IP connections.
+   */
+  private String channelSharing = "";
+
   /**
    * Whether to automatically reconnect to the qmgr when in client mode. Values can be YES/NO/QMGR/DISABLED.
    */
@@ -298,6 +304,15 @@ public void setOutboundSNI(String outboundSNI) {
     this.outboundSNI = outboundSNI;
   }
 
+  public String getChannelSharing() {
+    return channelSharing;
+  }
+
+  public void setChannelSharing(String channelSharing) {
+    System.setProperty(PROPERTY_CHANNEL_SHARING,channelSharing);
+    this.channelSharing = channelSharing;
+  }  
+
   // Both forms of this seem to have been used at different times. So we allow
   // either to be set. The local field named after the config option is actually
   // irrelevant; we always set a different common field.
@@ -446,6 +461,8 @@ public void traceProperties() {
     logger.trace("useIBMCipherMappings   : {}", isUseIBMCipherMappings());
     logger.trace("userAuthenticationMQCSP: {}", isUseAuthenticationMQCSP());
     logger.trace("outboundSNI            : \'{}\'", getOutboundSNI());
+    logger.trace("channelSharing         : \'{}\'", getChannelSharing());
+
 
     logger.trace("jndiCF          : {}", getJndi().getProviderContextFactory());
     logger.trace("jndiProviderUrl : {}", getJndi().getProviderUrl());

diff --git a/samples/s1/build.gradle b/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.8'
+ext.starterVersion = '2.7.9'
 
 // The local, flatDir configuration lets us use a modified version from
 // this repository without needing it released via maven

diff --git a/samples/s2.tls/build.gradle b/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.8'
+ext.starterVersion = '2.7.9'
 
 // The local, flatDir configuration lets us use a modified version from
 // this repository without needing it released via maven

diff --git a/samples/s2/build.gradle b/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.8'
+ext.starterVersion = '2.7.9'
 
 // The local, flatDir configuration lets us use a modified version from
 // this repository without needing it released via maven

diff --git a/samples/s3.jms3/build.gradle b/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.2'
+ext.starterVersion = '3.0.3'
 
 
 // The local, flatDir configuration lets us use a modified version from

diff --git a/samples/s3/build.gradle b/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.8'
+ext.starterVersion = '2.7.9'
 
 // The local, flatDir configuration lets us use a modified version from
 // this repository without needing it released via maven