Merge branch 'main' into protobuf-4.x-test-upgrade

Author: blakeli0

.github/release-please.yml

@@ -18,6 +18,11 @@ extraFiles:
     hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg
   - generation_config.yaml
 branches:
+  - branch: protobuf-4.x-rc
+    bumpMinorPreMajor: true
+    handleGHRelease: true
+    manifest: true
+    releaseType: java-yoshi
   - branch: 2.23.x
     releaseType: java-backport
     manifest: true

.github/workflows/ci.yaml

@@ -402,7 +402,7 @@ jobs:
         working-directory: java-showcase
         run: |
           mvn versions:set -B -ntp -DnewVersion=local
-          mvn clirr:check -B -ntp -Dclirr.skip=false -DcomparisonVersion=$SHOWCASE_CLIENT_VERSION
+          mvn clirr:check -B -ntp -DcomparisonVersion=$SHOWCASE_CLIENT_VERSION
 
   gapic-generator-java-bom:
     runs-on: ubuntu-22.04