Merge branch 'main' into skip-clirr-main

Author: blakeli0

gapic-generator-java-pom-parent/pom.xml

@@ -40,6 +40,8 @@
     <junit.version>5.11.4</junit.version>
     <mockito.version>4.11.0</mockito.version>
     <slf4j.version>2.0.16</slf4j.version>
+    <!--  skipping clirr check for protobuf 4.x upgrade -->
+    <clirr.skip>true</clirr.skip>
   </properties>
 
   <developers>
@@ -214,4 +216,4 @@
       <url>https://repo1.maven.org/maven2</url>
     </repository>
   </repositories>
-</project>
+</project>

java-showcase/proto-gapic-showcase-v1beta1/pom.xml

@@ -15,6 +15,7 @@
 
   <properties>
     <fmt.skip>true</fmt.skip>
+    <clirr.skip>true</clirr.skip>
   </properties>
 
   <dependencies>