Merge pull request #2863 from marecabo/hybridsim-protobuf-pom

Improve chance of compiling hybridsim and protobuf contrib
matsim-org · Oct 14, 2023 · 85cb852 · 85cb852
2 parents 6977833 + 7ba2377
commit 85cb852
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/contribs/hybridsim/pom.xml b/contribs/hybridsim/pom.xml
@@ -37,16 +37,20 @@
   </dependencies>
 
   <build>
-    <extensions>
-      <!-- Provides operation system information as property -->
-      <extension>
+    <plugins>
+      <plugin>
         <groupId>kr.motd.maven</groupId>
         <artifactId>os-maven-plugin</artifactId>
         <version>1.7.1</version>
-      </extension>
-    </extensions>
-
-    <plugins>
+        <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
@@ -30,16 +30,20 @@
     </dependencies>
 
     <build>
-        <extensions>
-            <!-- Provides operation system information as property -->
-            <extension>
+        <plugins>
+            <plugin>
                 <groupId>kr.motd.maven</groupId>
                 <artifactId>os-maven-plugin</artifactId>
                 <version>1.7.1</version>
-            </extension>
-        </extensions>
-
-        <plugins>
+                <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>