From e4c2df282a553bd7cc0ee5d8e3ed8df2ffe901d4 Mon Sep 17 00:00:00 2001 From: ibmmqmet Date: Fri, 20 Jan 2023 08:01:00 +0000 Subject: [PATCH] Update to latest Spring dependencies --- CHANGES.md | 4 ++++ README.md | 2 +- jms2.properties | 6 +++--- jms3.properties | 8 ++++---- samples/s1/build.gradle | 2 +- samples/s2.tls/RUNME.sh | 4 ++-- samples/s2.tls/build.gradle | 2 +- samples/s2.tls/buildJks | 18 ++++++++++++++++++ samples/s2.tls/key.jks | Bin 885 -> 887 bytes samples/s2.tls/qm1.arm | 28 ++++++++++++++-------------- samples/s2/build.gradle | 2 +- samples/s3.jms3/build.gradle | 2 +- samples/s3/build.gradle | 2 +- 13 files changed, 51 insertions(+), 29 deletions(-) create mode 100644 samples/s2.tls/buildJks diff --git a/CHANGES.md b/CHANGES.md index 001cc87..093f866 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,10 @@ # Changelog Newest updates are at the top of this file +## 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 + ## 2.7.6 and 3.0.0 (2022-11-24) - Update dependencies to Spring Boot 2.7.6/3.0.0 - Add "ibm.mq.jks.*" attributes to set keystore/truststore diff --git a/README.md b/README.md index 00c00ed..d416fff 100644 --- a/README.md +++ b/README.md @@ -313,7 +313,7 @@ The preferred approach for using this package in other projects will be to use t ### License -Copyright © 2018, 2022 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 diff --git a/jms2.properties b/jms2.properties index 965c7aa..4e2e13b 100644 --- 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.6' + mqStarterVersion = '2.7.8' // Direct Dependencies - give versions here - springVersion = '5.3.24' - springBootVersion = '2.7.6' + springVersion = '5.3.25' + springBootVersion = '2.7.8' // 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 index 9e6f447..e067fbe 100644 --- a/jms3.properties +++ b/jms3.properties @@ -2,13 +2,13 @@ ext { // Our shipped version - should usually match the Spring Boot Version but // we keep it different during the pre-GA releases - mqStarterVersion = '3.0.0' + mqStarterVersion = '3.0.2' // Direct Dependencies - give versions here - springVersion = '6.0.1' - springBootVersion = '3.0.0' + springVersion = '6.0.4' + springBootVersion = '3.0.2' - pooledJmsVersion = '3.0.0' + pooledJmsVersion = '3.1.0' jUnitVersion = '4.13.2' // MQ client has a 'jakarta' name diff --git a/samples/s1/build.gradle b/samples/s1/build.gradle index fc92b47..f7b9964 100644 --- 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.6' +ext.starterVersion = '2.7.8' // 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/RUNME.sh b/samples/s2.tls/RUNME.sh index e4989c3..65c3dd7 100644 --- a/samples/s2.tls/RUNME.sh +++ b/samples/s2.tls/RUNME.sh @@ -17,8 +17,8 @@ # connect to your queue manager. # # For the simple requirement of one-way authentication here, we have extracted -# the queue manager's public certificate into qm1.arm. And then imported it (I used -# strmqikm but command line tools could have been instead) into key.jks. +# the queue manager's public certificate into qm1.arm. And then imported it. The +# buildJks script can be used as an example of doing that. ###### Cleanup from previous runs # Kill any old instances of the application diff --git a/samples/s2.tls/build.gradle b/samples/s2.tls/build.gradle index 4f0604b..ea27483 100644 --- 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.6' +ext.starterVersion = '2.7.8' // 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/buildJks b/samples/s2.tls/buildJks new file mode 100644 index 0000000..c438741 --- /dev/null +++ b/samples/s2.tls/buildJks @@ -0,0 +1,18 @@ +# A very simple script to extract the QMgr's certificate from its kdb file +# and then add it back into a local JKS file (assuming it exists). This +# could be made a lot more bulletproof and get parameterised. But it's enough +# for my environment. + +# Password used for both the qmgr's keystore, and the new truststore that this +# program refers to +pw="passw0rd" + +set -x # So you can see what it's doing +# Default label for the qmgr certificate. Keystore given in qmgr attributes. +rm -f qm1.arm +runmqckm -cert -extract -db /var/mqm/ssl/key.kdb -pw $pw -label ibmwebspheremqqm1 -target qm1.arm + +# Now import that cert into a new keystore/truststore +rm -f key.jks +runmqckm -keydb -create -db key.jks -pw $pw -type jks +runmqckm -cert -add -db key.jks -pw $pw -file qm1.arm -label ibmwebspheremqqm1 diff --git a/samples/s2.tls/key.jks b/samples/s2.tls/key.jks index 4cd7a882086db0a2b11b8cd2f0309d1ff996d669..617f9caca2a480800e5a16d11cbe17937c54ceb7 100644 GIT binary patch delta 733 zcmV<30wVqO2KNR{{_Xzl00002000010000201;_oZFgm2b8u*7a%F9CacwaG00D)i zUob}i1z0XMFgXAK11&Iu11T_q0ui7C0s#U72rVH8Srfb{FOf?@8Zj|4IWaRbGBPk) z7Y#BqF)=eRF*7nUGB8?^S}l>&Ab;F%;LJT`SQdE=2ai<*m=!q<>UevyJjN9tt9P;< z6H%5+s(wqt7QWuxA?{B>5va4(#sfmzSD-c(rbl;fle3S3!YG!ZY++-Fppvj0FX`dR7x@30Bc@VnHp+m0O8FDYNV>PA24?w#oGeqsg{NX%j(^?F^baW{ z?J0PqzMDEB0BHamcr(GMSR?9u3+xA2Kg6O{OZHO0go5AKf5zK~?6xr*$<(`~oBq2a z+$k53<`QZH-0u+Q+SSo=DYCtO!I@Z}Sa@@Xi}K>i$_ALRIwpz1p-U8dxlk)*3e~tO$wksnje4Fc!BePC>zRrVNY%m`N163U( z1Q;+DfE11S&LNQU>#8_e@ahl@HSkd1 delta 709 zcmey)_LWWZ-`jt085kItfS3_X^JgaImZv5a7i6Rsr55HI0>ztCK2$bN)Ry8X?oyi@ z+sD6VqOYTrfw_UHfrY81v1ybzuaPm3YX;>`jM1HVRiS>iyiT7DqxGUd_4fJw$+H@c zpWE4#{3ldKl`*uTP4>LuwwHX&$)7*4#P91_YnG~EEA{T!@%D|(4P9xu(s|eA6t(Yu zSX*;VUJK2Gn+2AMLOm( z=ft$j{K7B1#W<7d?}YwIotMv=GW%v}lGM-G+40<|$>-M!9k{RUwkUeq&Dy%OV9v!C zIk`H!uXsowoiU&FPM3eyQE%1ft$9+<4J)=eo_w=W_S;0yHbzO=O95+^?+?0obNVU2 zDZ6K^Zh4Xw^k)Cntre5GtUvAU+O>RxCd2as=4bA&eiO%5-MKg-_v{L$wds?;GOE@W zJYU{Ye>lYRVt6bk%hsEU9aX#h4CL9ELuHj&Bn-qFM6fF0W#iOp^Jx3d%gD&f%D~*j z$jA`uAG>9Z%JcIZ2)DBpXsChyQnqt%CMzSQpy zkSu0dc)5eSe%A3aE!hmy*LU{py0CS^>DPZ+9xk<5A*h;LylJ^_di&Rf^=pJ~EM?2S zd*MaOxvK{b{Ej|X8vOU4x?1AT=$qN>rpuPyU=EpHC#lXLyiV5POsd(1D4q%5!jD}j zlfS5Q>Ayikaaj_RMB{&}iVsF*^-RkPU#}37;57bxlT+j1mkUnunoPo9