Merge branch 'main' into dependabot/maven/java/org.codehaus.mojo-build-helper-maven-plugin-3.6.1

Author: barrycaceres

java/pom.xml

@@ -85,7 +85,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
         <configuration>
           <createDependencyReducedPom>false</createDependencyReducedPom>
           <extraJars>