Flatten poms properly

smecalculus · Dec 10, 2023 · dfc9dbd · dfc9dbd
1 parent 9b4a6b5
commit dfc9dbd
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 30 deletions.
diff --git a/.github/workflows/template.yaml b/.github/workflows/template.yaml
@@ -24,4 +24,4 @@ jobs:
           source_repo_path: smecalculus/bezmen
           upstream_branch: main
           github_token: ${{ steps.orgbot.outputs.token }}
-          git_remote_pull_params: --allow-unrelated-histories --strategy=recursive -X ours
+          git_remote_pull_params: --allow-unrelated-histories --strategy=recursive -X theirs
diff --git a/libs/abstraction-client/pom.xml b/libs/abstraction-client/pom.xml
@@ -23,6 +23,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>

diff --git a/libs/messaging-client/pom.xml b/libs/messaging-client/pom.xml
@@ -36,6 +36,10 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>

diff --git a/libs/pom.xml b/libs/pom.xml
@@ -214,10 +214,6 @@
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>flatten-maven-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -234,30 +230,6 @@
 
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>flatten-maven-plugin</artifactId>
-          <configuration>
-            <flattenMode>resolveCiFriendliesOnly</flattenMode>
-            <outputDirectory>${project.build.directory}</outputDirectory>
-          </configuration>
-          <executions>
-            <execution>
-              <id>flatten</id>
-              <phase>process-resources</phase>
-              <goals>
-                <goal>flatten</goal>
-              </goals>
-            </execution>
-            <execution>
-              <id>flatten.clean</id>
-              <phase>clean</phase>
-              <goals>
-                <goal>clean</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,8 +6,8 @@
 
   <groupId>smecalculus.bezmen</groupId>
   <artifactId>bezmen</artifactId>
-  <version>latest</version>
   <packaging>pom</packaging>
+  <version>latest</version>
 
   <modules>
     <module>libs</module>
@@ -103,6 +103,26 @@
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>flatten-maven-plugin</artifactId>
           <version>1.5.0</version>
+          <configuration>
+            <flattenMode>oss</flattenMode>
+            <outputDirectory>${project.build.directory}</outputDirectory>
+          </configuration>
+          <executions>
+            <execution>
+              <id>flatten</id>
+              <phase>process-resources</phase>
+              <goals>
+                <goal>flatten</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>flatten.clean</id>
+              <phase>clean</phase>
+              <goals>
+                <goal>clean</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
           <groupId>org.jetbrains.kotlin</groupId>