Merge Conflict Resolution (from 7.5.x to 7.6.x)

.semaphore/semaphore.yml

@@ -37,6 +37,7 @@ blocks:
       jobs:
         - name: Test
           commands:
+            - . sem-pint -c
             - ci-tools ci-update-version
             - mvn -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode --no-transfer-progress clean verify install dependency:analyze validate
             - . cache-maven store
@@ -60,29 +61,6 @@ blocks:
             - mvn -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode -DaltDeploymentRepository=confluent-codeartifact-internal::default::https://confluent-519856050701.d.codeartifact.us-west-2.amazonaws.com/maven/maven-snapshots/
               -DrepositoryId=confluent-codeartifact-internal deploy -DskipTests
 
-  - name: CP Jar Build CI Gating
-    dependencies: [ ]
-    run:
-      # Run this block only for pull requests
-      when: "pull_request =~ '.*'"
-    task:
-      jobs:
-        - name: Trigger and wait for CP Jar Build Task
-          commands:
-            # Don't run this block if target branch for PR is not a nightly branch or master branch
-            # cp-jar-build today doesn't support other branches
-            - |
-              if [[ "$SEMAPHORE_GIT_BRANCH" =~ ^[0-9]+\.[0-9]+\.x$ ]] || [[ "$SEMAPHORE_GIT_BRANCH" == "master" ]] ; then \
-                  echo "PR is targeted to ${SEMAPHORE_GIT_BRANCH} branch which is CP nightly or master branch. Triggering cp-jar-build task."; \
-                  sem-trigger -p packaging \
-                    -t cp-jar-build \
-                    -b $SEMAPHORE_GIT_BRANCH \
-                    -d "|" -i "CUSTOM_BRANCH_COMPONENTS|schema-registry=${SEMAPHORE_GIT_WORKING_BRANCH}" \
-                    -w; \
-              else \
-                  echo "PR is targeted to ${SEMAPHORE_GIT_BRANCH} branch which is not CP nightly or master branch. Skipping cp-jar-build task."; \
-              fi;
-
 after_pipeline:
   task:
     agent: