Fix: Ikke flatten fp-bom. (#350)

Ellers forsvinner alle `test` avhengigheter og `build` dependencies. Noe vi ikke vil med bom.
navikt · Mar 9, 2023 · ae1b42d · ae1b42d
1 parent a028ae0
commit ae1b42d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,4 +9,5 @@ jobs:
     uses: navikt/fp-gha-workflows/.github/workflows/release-feature.yml@main
     with:
       release-version: ${{ github.event.release.tag_name }}
+      release-profiles: ''
     secrets: inherit
diff --git a/pom.xml b/pom.xml
@@ -680,6 +680,26 @@
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>flatten-maven-plugin</artifactId>
                     <version>1.3.0</version>
+                    <configuration>
+                        <flattenMode>bom</flattenMode>
+                        <flattenedPomFilename>.flattened</flattenedPomFilename>
+                    </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>
@@ -741,26 +761,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>flatten-maven-plugin</artifactId>
-                        <configuration>
-                            <flattenMode>bom</flattenMode>
-                            <flattenedPomFilename>.flattened</flattenedPomFilename>
-                        </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>
                 </plugins>
             </build>