From bef14c7b0cd2687257b4a4bdec2d8c36e73d030d Mon Sep 17 00:00:00 2001 From: ibmmqmet Date: Fri, 4 Dec 2020 11:35:38 +0000 Subject: [PATCH] Update for MQ 9.2.1 --- CHANGELOG.md | 3 +++ Dockerfile | 2 +- ibmmq/cmqc_aix.go | 7 ++++--- ibmmq/cmqc_darwin.go | 7 ++++--- ibmmq/cmqc_linux_amd64.go | 7 ++++--- ibmmq/cmqc_linux_ppc64le.go | 7 ++++--- ibmmq/cmqc_linux_s390x.go | 7 ++++--- ibmmq/cmqc_windows.go | 7 ++++--- ibmmq/mqi.go | 2 +- ibmmq/mqistr.go | 4 ++++ samples/README.md | 4 ++-- samples/runSample.Dockerfile | 2 +- samples/runSample.gomod | 2 +- 13 files changed, 37 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90566fd..659d2e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog Newest updates are at the top of this file. +## Dec 04 2020 - v5.1.3 +* Update for MQ 9.2.1 + ## Sep 29 2020 - no new version * samples - Add script to build a running container with a sample program in it diff --git a/Dockerfile b/Dockerfile index f1d4cc9..4fd6a31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,7 +52,7 @@ RUN mkdir -p $GOPATH/src $GOPATH/bin $GOPATH/pkg \ # Location of the downloadable MQ client package \ ENV RDURL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist" \ RDTAR="IBM-MQC-Redist-LinuxX64.tar.gz" \ - VRMF=9.2.0.0 + VRMF=9.2.1.0 # Install the MQ client from the Redistributable package. This also contains the # header files we need to compile against. Setup the subset of the package diff --git a/ibmmq/cmqc_aix.go b/ibmmq/cmqc_aix.go index def9529..f43323e 100644 --- a/ibmmq/cmqc_aix.go +++ b/ibmmq/cmqc_aix.go @@ -32,8 +32,8 @@ package ibmmq **************************************************************** * * -* Generated on: 7/9/20 2:30 PM -* Build Level: p920-L200709 +* Generated on: 11/12/20 5:27 PM +* Build Level: p921-L201112.1 * Build Type: Production * */ @@ -1004,7 +1004,7 @@ const ( MQCMDI_SEC_SIGNOFF_ERROR int32 = 17 MQCMDI_SEC_TIMER_ZERO int32 = 14 MQCMDI_SEC_UPPERCASE int32 = 21 - MQCMDL_CURRENT_LEVEL int32 = 920 + MQCMDL_CURRENT_LEVEL int32 = 921 MQCMDL_LEVEL_1 int32 = 100 MQCMDL_LEVEL_101 int32 = 101 MQCMDL_LEVEL_110 int32 = 110 @@ -1046,6 +1046,7 @@ const ( MQCMDL_LEVEL_914 int32 = 914 MQCMDL_LEVEL_915 int32 = 915 MQCMDL_LEVEL_920 int32 = 920 + MQCMDL_LEVEL_921 int32 = 921 MQCMD_ACCOUNTING_MQI int32 = 167 MQCMD_ACCOUNTING_Q int32 = 168 MQCMD_ACTIVITY_MSG int32 = 69 diff --git a/ibmmq/cmqc_darwin.go b/ibmmq/cmqc_darwin.go index 4f20ea7..01c194d 100644 --- a/ibmmq/cmqc_darwin.go +++ b/ibmmq/cmqc_darwin.go @@ -30,8 +30,8 @@ package ibmmq **************************************************************** * * -* Generated on: 7/9/20 2:30 PM -* Build Level: p920-L200709 +* Generated on: 11/12/20 5:27 PM +* Build Level: p921-L201112.1 * Build Type: Production * */ @@ -1002,7 +1002,7 @@ const ( MQCMDI_SEC_SIGNOFF_ERROR int32 = 17 MQCMDI_SEC_TIMER_ZERO int32 = 14 MQCMDI_SEC_UPPERCASE int32 = 21 - MQCMDL_CURRENT_LEVEL int32 = 920 + MQCMDL_CURRENT_LEVEL int32 = 921 MQCMDL_LEVEL_1 int32 = 100 MQCMDL_LEVEL_101 int32 = 101 MQCMDL_LEVEL_110 int32 = 110 @@ -1044,6 +1044,7 @@ const ( MQCMDL_LEVEL_914 int32 = 914 MQCMDL_LEVEL_915 int32 = 915 MQCMDL_LEVEL_920 int32 = 920 + MQCMDL_LEVEL_921 int32 = 921 MQCMD_ACCOUNTING_MQI int32 = 167 MQCMD_ACCOUNTING_Q int32 = 168 MQCMD_ACTIVITY_MSG int32 = 69 diff --git a/ibmmq/cmqc_linux_amd64.go b/ibmmq/cmqc_linux_amd64.go index 5819dbd..d845508 100644 --- a/ibmmq/cmqc_linux_amd64.go +++ b/ibmmq/cmqc_linux_amd64.go @@ -30,8 +30,8 @@ package ibmmq **************************************************************** * * -* Generated on: 7/9/20 2:30 PM -* Build Level: p920-L200709 +* Generated on: 11/12/20 5:27 PM +* Build Level: p921-L201112.1 * Build Type: Production * */ @@ -1002,7 +1002,7 @@ const ( MQCMDI_SEC_SIGNOFF_ERROR int32 = 17 MQCMDI_SEC_TIMER_ZERO int32 = 14 MQCMDI_SEC_UPPERCASE int32 = 21 - MQCMDL_CURRENT_LEVEL int32 = 920 + MQCMDL_CURRENT_LEVEL int32 = 921 MQCMDL_LEVEL_1 int32 = 100 MQCMDL_LEVEL_101 int32 = 101 MQCMDL_LEVEL_110 int32 = 110 @@ -1044,6 +1044,7 @@ const ( MQCMDL_LEVEL_914 int32 = 914 MQCMDL_LEVEL_915 int32 = 915 MQCMDL_LEVEL_920 int32 = 920 + MQCMDL_LEVEL_921 int32 = 921 MQCMD_ACCOUNTING_MQI int32 = 167 MQCMD_ACCOUNTING_Q int32 = 168 MQCMD_ACTIVITY_MSG int32 = 69 diff --git a/ibmmq/cmqc_linux_ppc64le.go b/ibmmq/cmqc_linux_ppc64le.go index 6419dbe..8fc7116 100644 --- a/ibmmq/cmqc_linux_ppc64le.go +++ b/ibmmq/cmqc_linux_ppc64le.go @@ -30,8 +30,8 @@ package ibmmq **************************************************************** * * -* Generated on: 7/9/20 2:30 PM -* Build Level: p920-L200709 +* Generated on: 11/12/20 5:27 PM +* Build Level: p921-L201112.1 * Build Type: Production * */ @@ -1002,7 +1002,7 @@ const ( MQCMDI_SEC_SIGNOFF_ERROR int32 = 17 MQCMDI_SEC_TIMER_ZERO int32 = 14 MQCMDI_SEC_UPPERCASE int32 = 21 - MQCMDL_CURRENT_LEVEL int32 = 920 + MQCMDL_CURRENT_LEVEL int32 = 921 MQCMDL_LEVEL_1 int32 = 100 MQCMDL_LEVEL_101 int32 = 101 MQCMDL_LEVEL_110 int32 = 110 @@ -1044,6 +1044,7 @@ const ( MQCMDL_LEVEL_914 int32 = 914 MQCMDL_LEVEL_915 int32 = 915 MQCMDL_LEVEL_920 int32 = 920 + MQCMDL_LEVEL_921 int32 = 921 MQCMD_ACCOUNTING_MQI int32 = 167 MQCMD_ACCOUNTING_Q int32 = 168 MQCMD_ACTIVITY_MSG int32 = 69 diff --git a/ibmmq/cmqc_linux_s390x.go b/ibmmq/cmqc_linux_s390x.go index 1140744..541302f 100644 --- a/ibmmq/cmqc_linux_s390x.go +++ b/ibmmq/cmqc_linux_s390x.go @@ -30,8 +30,8 @@ package ibmmq **************************************************************** * * -* Generated on: 7/9/20 2:30 PM -* Build Level: p920-L200709 +* Generated on: 11/12/20 5:27 PM +* Build Level: p921-L201112.1 * Build Type: Production * */ @@ -1002,7 +1002,7 @@ const ( MQCMDI_SEC_SIGNOFF_ERROR int32 = 17 MQCMDI_SEC_TIMER_ZERO int32 = 14 MQCMDI_SEC_UPPERCASE int32 = 21 - MQCMDL_CURRENT_LEVEL int32 = 920 + MQCMDL_CURRENT_LEVEL int32 = 921 MQCMDL_LEVEL_1 int32 = 100 MQCMDL_LEVEL_101 int32 = 101 MQCMDL_LEVEL_110 int32 = 110 @@ -1044,6 +1044,7 @@ const ( MQCMDL_LEVEL_914 int32 = 914 MQCMDL_LEVEL_915 int32 = 915 MQCMDL_LEVEL_920 int32 = 920 + MQCMDL_LEVEL_921 int32 = 921 MQCMD_ACCOUNTING_MQI int32 = 167 MQCMD_ACCOUNTING_Q int32 = 168 MQCMD_ACTIVITY_MSG int32 = 69 diff --git a/ibmmq/cmqc_windows.go b/ibmmq/cmqc_windows.go index 9cc2227..b1cee38 100644 --- a/ibmmq/cmqc_windows.go +++ b/ibmmq/cmqc_windows.go @@ -30,8 +30,8 @@ package ibmmq **************************************************************** * * -* Generated on: 7/9/20 2:30 PM -* Build Level: p920-L200709 +* Generated on: 11/12/20 5:27 PM +* Build Level: p921-L201112.1 * Build Type: Production * */ @@ -1002,7 +1002,7 @@ const ( MQCMDI_SEC_SIGNOFF_ERROR int32 = 17 MQCMDI_SEC_TIMER_ZERO int32 = 14 MQCMDI_SEC_UPPERCASE int32 = 21 - MQCMDL_CURRENT_LEVEL int32 = 920 + MQCMDL_CURRENT_LEVEL int32 = 921 MQCMDL_LEVEL_1 int32 = 100 MQCMDL_LEVEL_101 int32 = 101 MQCMDL_LEVEL_110 int32 = 110 @@ -1044,6 +1044,7 @@ const ( MQCMDL_LEVEL_914 int32 = 914 MQCMDL_LEVEL_915 int32 = 915 MQCMDL_LEVEL_920 int32 = 920 + MQCMDL_LEVEL_921 int32 = 921 MQCMD_ACCOUNTING_MQI int32 = 167 MQCMD_ACCOUNTING_Q int32 = 168 MQCMD_ACTIVITY_MSG int32 = 69 diff --git a/ibmmq/mqi.go b/ibmmq/mqi.go index 4bd490c..2fd12f4 100644 --- a/ibmmq/mqi.go +++ b/ibmmq/mqi.go @@ -6,7 +6,7 @@ of MQOPEN etc. For more information on the MQI, including detailed descriptions of the functions, constants and structures, see the MQ Knowledge Center -at https://www.ibm.com/support/knowledgecenter/en/SSFKSJ_9.1.0/com.ibm.mq.dev.doc/q023720_.htm#q023720_ +at https://www.ibm.com/support/knowledgecenter/en/SSFKSJ_latest/com.ibm.mq.dev.doc/q023720_.htm#q023720_ If an MQI call returns MQCC_FAILED or MQCC_WARNING, a custom error type is returned containing the MQCC/MQRC values as well as diff --git a/ibmmq/mqistr.go b/ibmmq/mqistr.go index 1f1f93d..159f51b 100644 --- a/ibmmq/mqistr.go +++ b/ibmmq/mqistr.go @@ -1,3 +1,5 @@ +// +build go1.13 + package ibmmq /* @@ -1377,6 +1379,8 @@ func MQItoString(class string, value int) string { s = "MQCMDL_LEVEL_915" case 920: s = "MQCMDL_LEVEL_920" + case 921: + s = "MQCMDL_LEVEL_921" default: s = "" } diff --git a/samples/README.md b/samples/README.md index 9e2262a..884b524 100644 --- a/samples/README.md +++ b/samples/README.md @@ -75,8 +75,8 @@ connect to a queue manager running on the host machine. ## More information Comments in the programs explain what they are doing. For more detailed information about the MQ API, the functions, structures, and constants, see the -[MQ Knowledge Center](https://www.ibm.com/support/knowledgecenter/en/SSFKSJ_9.1.0/com.ibm.mq.ref.dev.doc/q089590_.htm). +[MQ Knowledge Center](https://www.ibm.com/support/knowledgecenter/en/SSFKSJ_latest/com.ibm.mq.ref.dev.doc/q089590_.html). -You can also find general MQ application development advice [here](https://www.ibm.com/support/knowledgecenter/en/SSFKSJ_9.1.0/com.ibm.mq.dev.doc/q022830_.htm). +You can also find general MQ application development advice [here](https://www.ibm.com/support/knowledgecenter/en/SSFKSJ_latest/com.ibm.mq.dev.doc/q022830_.html). Information about development for procedural programming languages such as C in that documentation is most relevant for the interface exported by this Go package. diff --git a/samples/runSample.Dockerfile b/samples/runSample.Dockerfile index 9b9dd2f..1b4f51e 100644 --- a/samples/runSample.Dockerfile +++ b/samples/runSample.Dockerfile @@ -50,7 +50,7 @@ RUN mkdir -p $GOPATH/src $GOPATH/bin $GOPATH/pkg \ # Location of the downloadable MQ client package \ ENV RDURL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist" \ RDTAR="IBM-MQC-Redist-LinuxX64.tar.gz" \ - VRMF=9.2.0.0 + VRMF=9.2.1.0 # Install the MQ client from the Redistributable package. This also contains the # header files we need to compile against. Setup the subset of the package diff --git a/samples/runSample.gomod b/samples/runSample.gomod index 26a2678..06edab2 100644 --- a/samples/runSample.gomod +++ b/samples/runSample.gomod @@ -3,5 +3,5 @@ module amqsput/v5 go 1.13 require ( - github.com/ibm-messaging/mq-golang/v5 v5.1.2 + github.com/ibm-messaging/mq-golang/v5 v5 )