Merge remote-tracking branch 'upstream/main' into backport/main-1.x

Author: bitwiseman

pom.xml

@@ -436,7 +436,7 @@
       <plugin>
         <groupId>com.github.siom79.japicmp</groupId>
         <artifactId>japicmp-maven-plugin</artifactId>
-        <version>0.17.2</version>
+        <version>0.23.0</version>
         <configuration>
           <oldVersion>
             <dependency>