From 837dcb4997a196bae4d21c79cd8ff41dd0f28e98 Mon Sep 17 00:00:00 2001
From: marecabo <23156476+marecabo@users.noreply.github.com>
Date: Fri, 13 Oct 2023 09:29:38 +0200
Subject: [PATCH 1/2] Add plugin in pom that helps compiling hybridsim and
 protobuf contrib

---
 contribs/hybridsim/pom.xml | 13 +++++++++++++
 contribs/protobuf/pom.xml  | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/contribs/hybridsim/pom.xml b/contribs/hybridsim/pom.xml
index b8ad9953749..ee24543b69c 100644
--- a/contribs/hybridsim/pom.xml
+++ b/contribs/hybridsim/pom.xml
@@ -47,6 +47,19 @@
     </extensions>
 
     <plugins>
+      <plugin>
+        <groupId>kr.motd.maven</groupId>
+        <artifactId>os-maven-plugin</artifactId>
+        <version>1.7.1</version>
+        <executions>
+          <execution>
+            <phase>initialize</phase>
+            <goals>
+              <goal>detect</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.xolstice.maven.plugins</groupId>
         <artifactId>protobuf-maven-plugin</artifactId>
diff --git a/contribs/protobuf/pom.xml b/contribs/protobuf/pom.xml
index a615a38b049..27006087967 100644
--- a/contribs/protobuf/pom.xml
+++ b/contribs/protobuf/pom.xml
@@ -40,6 +40,19 @@
         </extensions>
 
         <plugins>
+            <plugin>
+                <groupId>kr.motd.maven</groupId>
+                <artifactId>os-maven-plugin</artifactId>
+                <version>1.7.1</version>
+                <executions>
+                    <execution>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>detect</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>

From b074f117bddd032eb02fc972e85efbf72593e5ef Mon Sep 17 00:00:00 2001
From: marecabo <23156476+marecabo@users.noreply.github.com>
Date: Sat, 14 Oct 2023 13:43:44 +0200
Subject: [PATCH 2/2] Remove os-maven-plugin extension in favor of plugin

---
 contribs/hybridsim/pom.xml | 9 ---------
 contribs/protobuf/pom.xml  | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/contribs/hybridsim/pom.xml b/contribs/hybridsim/pom.xml
index ee24543b69c..2a8fffb488b 100644
--- a/contribs/hybridsim/pom.xml
+++ b/contribs/hybridsim/pom.xml
@@ -37,15 +37,6 @@
   </dependencies>
 
   <build>
-    <extensions>
-      <!-- Provides operation system information as property -->
-      <extension>
-        <groupId>kr.motd.maven</groupId>
-        <artifactId>os-maven-plugin</artifactId>
-        <version>1.7.1</version>
-      </extension>
-    </extensions>
-
     <plugins>
       <plugin>
         <groupId>kr.motd.maven</groupId>
diff --git a/contribs/protobuf/pom.xml b/contribs/protobuf/pom.xml
index 27006087967..56b7e7b9e14 100644
--- a/contribs/protobuf/pom.xml
+++ b/contribs/protobuf/pom.xml
@@ -30,15 +30,6 @@
     </dependencies>
 
     <build>
-        <extensions>
-            <!-- Provides operation system information as property -->
-            <extension>
-                <groupId>kr.motd.maven</groupId>
-                <artifactId>os-maven-plugin</artifactId>
-                <version>1.7.1</version>
-            </extension>
-        </extensions>
-
         <plugins>
             <plugin>
                 <groupId>kr.motd.maven</groupId>