[IBMMQ] Bump version to 9.3.2.1

tnb-software · May 22, 2023 · 171ffa2 · 171ffa2
1 parent 6a2b248
commit 171ffa2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/system-x/services/jms/ibm-mq/pom.xml b/system-x/services/jms/ibm-mq/pom.xml
@@ -14,7 +14,7 @@
     <name>TNB :: System-X :: Services :: JMS :: IBM-MQ</name>
 
     <properties>
-        <ibm.mq.version>9.3.0.0</ibm.mq.version>
+        <ibm.mq.version>9.3.2.1</ibm.mq.version>
     </properties>
 
     <dependencies>

diff --git a/...vices/jms/ibm-mq/src/main/java/software/tnb/jms/ibm/mq/resource/local/IBMMQContainer.java b/...vices/jms/ibm-mq/src/main/java/software/tnb/jms/ibm/mq/resource/local/IBMMQContainer.java
@@ -19,7 +19,8 @@ public IBMMQContainer(String image, Map<String, String> env, String mqsc) {
         withExposedPorts(IBMMQ.DEFAULT_PORT);
         withFileSystemBind(mqscCommandFilePath.toAbsolutePath().toString(), IBMMQ.MQSC_COMMAND_FILES_LOCATION + "/" + IBMMQ.MQSC_COMMAND_FILE_NAME);
         withEnv(env);
-        waitingFor(Wait.forLogMessage(".*Started web server.*", 1));
+        // AMQ5806I is a message code for queue manager start
+        waitingFor(Wait.forLogMessage(".*AMQ5806I.*", 1));
     }
 
     private void createLocalMqscCommandFile(String content) {

diff --git a/system-x/services/jms/ibm-mq/src/main/java/software/tnb/jms/ibm/mq/service/IBMMQ.java b/system-x/services/jms/ibm-mq/src/main/java/software/tnb/jms/ibm/mq/service/IBMMQ.java
@@ -45,7 +45,7 @@ public Map<String, String> containerEnvironment() {
     public abstract int port();
 
     public String defaultImage() {
-        return "icr.io/ibm-messaging/mq:9.2.5.0-r1";
+        return "icr.io/ibm-messaging/mq:9.3.2.1-r1";
     }
 
     /**
@@ -56,7 +56,8 @@ public String defaultImage() {
      */
     public String mqscConfig() {
         return "SET AUTHREC PROFILE('*') PRINCIPAL('" + account().username() + "') OBJTYPE(TOPIC) AUTHADD(ALL)\n"
-            + "SET AUTHREC PROFILE('*') PRINCIPAL('" + account().username() + "') OBJTYPE(QUEUE) AUTHADD(ALL)\n";
+            + "SET AUTHREC PROFILE('*') PRINCIPAL('" + account().username() + "') OBJTYPE(QUEUE) AUTHADD(ALL)\n"
+            + "SET AUTHREC PROFILE('SYSTEM.DEFAULT.MODEL.QUEUE') OBJTYPE(QUEUE) PRINCIPAL('" + account().username() + "') AUTHADD(ALL)\n";
     }
 
     public void openResources() {

diff --git a/...services/jms/ibm-mq/src/main/java/software/tnb/jms/ibm/mq/validation/IBMMQValidation.java b/...services/jms/ibm-mq/src/main/java/software/tnb/jms/ibm/mq/validation/IBMMQValidation.java
@@ -39,7 +39,7 @@ private MQQueueManager createQueueManager(String host, int port) {
         Hashtable<String, Object> properties = new Hashtable<>();
         properties.put(MQConstants.HOST_NAME_PROPERTY, host);
         properties.put(MQConstants.PORT_PROPERTY, port);
-        properties.put(MQConstants.CHANNEL_PROPERTY, "DEV.ADMIN.SVRCONN");
+        properties.put(MQConstants.CHANNEL_PROPERTY, account.adminChannel());
         properties.put(MQConstants.USE_MQCSP_AUTHENTICATION_PROPERTY, true);
         properties.put(MQConstants.USER_ID_PROPERTY, account.adminUsername());
         properties.put(MQConstants.PASSWORD_PROPERTY, account.adminPassword());