From 42484bd884a184e1078040bbacc450a578d07897 Mon Sep 17 00:00:00 2001
From: Ryan Emerson <remerson@redhat.com>
Date: Tue, 8 Oct 2024 15:22:41 +0100
Subject: [PATCH] Allow proto-schema-compatibility-maven-plugin to be skipped
 with property (#33693)

Closes #33692

Signed-off-by: Ryan Emerson <remerson@redhat.com>
---
 model/infinispan/pom.xml | 2 +-
 pom.xml                  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/model/infinispan/pom.xml b/model/infinispan/pom.xml
index 8fcada84df3..75afcc0a15f 100755
--- a/model/infinispan/pom.xml
+++ b/model/infinispan/pom.xml
@@ -106,7 +106,7 @@
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
+                <configuration combine.self="append">
                     <remoteLockFiles>https://raw.githubusercontent.com/keycloak/keycloak/refs/heads/release/26.0/model/infinispan/proto.lock</remoteLockFiles>
                 </configuration>
             </plugin>
diff --git a/pom.xml b/pom.xml
index cb42676374e..1777866f1f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,6 +242,7 @@
 
         <!-- Set to true on release to update proto.lock files -->
         <commitProtoLockChanges>false</commitProtoLockChanges>
+        <skipProtoLock>false</skipProtoLock>
     </properties>
 
     <url>http://keycloak.org</url>
@@ -1564,6 +1565,7 @@
                     <version>${protostream.plugin.version}</version>
                     <configuration>
                         <commitProtoLock>${commitProtoLockChanges}</commitProtoLock>
+                        <skip>${skipProtoLock}</skip>
                     </configuration>
                 </plugin>
             </plugins>