Merge branch 'master' into per-column-formatting

Author: jeffgbutler

pom.xml

@@ -187,7 +187,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-jdbc</artifactId>
-      <version>5.2.5.RELEASE</version>
+      <version>5.2.6.RELEASE</version>
       <scope>provided</scope>
     </dependency>
 
@@ -212,7 +212,7 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.15.0</version>
+      <version>3.16.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>