Update to latest Spring dependencies

ibm-messaging · Jan 20, 2023 · e4c2df2 · e4c2df2
1 parent f381836
commit e4c2df2
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/samples/s2.tls/qm1.arm b/samples/s2.tls/qm1.arm
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIIDKTCCAhGgAwIBAgIIc4omnV2OD6wwDQYJKoZIhvcNAQENBQAwKjEMMAoGA1UECxMDSUJNMRow
-GAYDVQQDExFpYm13ZWJzcGhlcmVtcXFtMTAeFw0yMjA3MDUwODU5MzVaFw0yMzA3MDYwODU5MzVa
+MIIDKTCCAhGgAwIBAgIILSEHWRO8KC8wDQYJKoZIhvcNAQENBQAwKjEMMAoGA1UECxMDSUJNMRow
+GAYDVQQDExFpYm13ZWJzcGhlcmVtcXFtMTAeFw0yMjExMjkxMzIyMjBaFw0yMzExMzAxMzIyMjBa
 MCoxDDAKBgNVBAsTA0lCTTEaMBgGA1UEAxMRaWJtd2Vic3BoZXJlbXFxbTEwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCbHyyOPAE7olEnh5+PY5qAx865gmP8VRwlAVWAhh3PMbbpDgNj
-8/AEX76MrTZlKD0a7sbHh7EDgIpmbRtu1x4hK930qInFeBRjvECh7/dFD9YTMfI501cgk1snAze7
-5d4AXOUJRq54HvwHWCMWNpcetBtc0wmRZtMPE+hLFgli3FX8ZZ5vBWSb2XViGvldm18LZWPPrRLA
-3ytGoluW2X1+ZlMJo9EJComL1EgbxZifBdyKT2rFSyXnhW4a5zF4tkHJ7LEd9pFJhgEZHdJQrKe/
-UtHZl8pOlLuYq4TkalLsv9W1eJMKO/K7irqnsCkA58A3zN+r7F4Ge4mjWG3NqK1nAgMBAAGjUzBR
-MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFHDnp4R/w1RJ0VddCQS12SGIerpOMB8GA1UdIwQY
-MBaAFHDnp4R/w1RJ0VddCQS12SGIerpOMA0GCSqGSIb3DQEBDQUAA4IBAQBdT120rCTnz1L77FEQ
-o03GwwH/rp7nDT5hCH8lwIHpiHe9yXxuwqkyq8J89H+7UBlzBKHTiAuax3YqHWg169y8utC1kMvr
-/IThpTioESVtc7KnTWeH9aF/rBLYpQZr3dDoZM7VwMD7W851U/3+JyZh+VvZawc1pqbYA1SXfhkn
-ABOuHUDMZTbQWgyQ9lfG0HYf0SzS/zCAc3ZiAhiB/zp48DJ2fwKnceuoEhgJM/PZCSjB9NBCKQIT
-9R85snkOYKu2hxH00zMq7XXMqKTKBXdvP6Zny5yh9WUfrJrcxg35tKQtq/XBKo7BwFVe/hIcDez0
-SBu6QOL2a/tBKKv3LQcB
+DQEBAQUAA4IBDwAwggEKAoIBAQDcb+DMPWVYFnkNB49VBJgVOQ3qeHuyPMYVH6t3sh4TUZZLqn5L
+wha+3twh7k9BEaiz1cYDQttXoDYVpkd3bpOzj4HCKJahbGFjiKCSsBzkBO8UHae2/IbpBn8v6eHK
+F/j/miOmUmo2yoB+SvkTyki6t6QGZvmDnCxTxIWnYlyO3c30Dykk7Sl4pL6bOiEAaQAceDPBqFgj
+6nwL7AdYP8SiVUv2UsCEgt/Xf8bbh+y2MRvJ1Lukm/67I9wpF5DmEmoD3O8Q59rV0XIpsr1+wZlY
+n1h4c4eL+KWVVhPPcGJFzPiUwsOGXHDbSlD5Itoa21zb6h6d7vYtAZe2WrNu3tvTAgMBAAGjUzBR
+MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI3547YrIyh8m+uPI7NOe77Og1tsMB8GA1UdIwQY
+MBaAFI3547YrIyh8m+uPI7NOe77Og1tsMA0GCSqGSIb3DQEBDQUAA4IBAQDBbPGZ5M4Dsp2zlqtl
++ogOrSbDkX9im02r0njAfQ5mPJx5Otpk65xPXv/ZCqFINgyEuAaYL5m3BtbKk3qinaWj4+4DBi/H
+DP7tWjnans55VIf656HXVciF7J0UIJmDgo1L7MR26VtGctkkY14dQdB8XidPQSYXMsHfjg6ownmA
+rLoCuMg3uUbHx7goFHgWLnkIqZjBKZab0YAg7Xp9unYYtoHz/39DE9ZU7HySpVthcyGwbomEyQx1
+twtkxdjwmlnH0vvMlK6u+AF55sJlxIKkOWscZ+Whrueb+bRSzQvISEzqnEwyu9lxvHGY7IIflEC5
+2CPSmg7/LtRJwCJrZKzp
 -----END CERTIFICATE-----
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.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/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.0'
+ext.starterVersion = '3.0.2'
 
 
 // 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.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