Skip to content

Commit d2daa87

Browse files
committed
fix: fix plugin configuration
Most plugins should have been defined in pluginManagement only. Added the flatten-maven-plugin to make sure the revision property does not propagate from models.
1 parent 0aac227 commit d2daa87

1 file changed

Lines changed: 67 additions & 32 deletions

File tree

model/facade/model-parent/pom.xml

Lines changed: 67 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
<!-- ************************************************************************ -->
7575
<version.antrun.plugin>3.2.0</version.antrun.plugin>
7676
<version.exec.plugin>3.6.3</version.exec.plugin>
77+
<version.flatten.plugin>1.7.3</version.flatten.plugin>
7778
<version.google-jib>3.5.1</version.google-jib>
7879
<version.jib-layer-filter-extension-maven>0.3.0</version.jib-layer-filter-extension-maven>
7980
<version.openapi-diff.plugin>2.1.7</version.openapi-diff.plugin>
@@ -188,6 +189,71 @@
188189
</dependencies>
189190

190191
<build>
192+
<pluginManagement>
193+
<plugins>
194+
<plugin>
195+
<groupId>org.codehaus.mojo</groupId>
196+
<artifactId>flatten-maven-plugin</artifactId>
197+
<version>${version.flatten.plugin}</version>
198+
<configuration>
199+
<updatePomFile>true</updatePomFile>
200+
<flattenMode>resolveCiFriendliesOnly</flattenMode>
201+
<keepCommentsInPom>true</keepCommentsInPom>
202+
</configuration>
203+
<executions>
204+
<execution>
205+
<id>flatten</id>
206+
<phase>process-resources</phase>
207+
<goals>
208+
<goal>flatten</goal>
209+
</goals>
210+
</execution>
211+
<execution>
212+
<id>flatten.clean</id>
213+
<phase>clean</phase>
214+
<goals>
215+
<goal>clean</goal>
216+
</goals>
217+
</execution>
218+
</executions>
219+
</plugin>
220+
<plugin>
221+
<groupId>com.google.cloud.tools</groupId>
222+
<artifactId>jib-maven-plugin</artifactId>
223+
<version>${version.google-jib}</version>
224+
<dependencies>
225+
<dependency>
226+
<groupId>com.google.cloud.tools</groupId>
227+
<artifactId>jib-layer-filter-extension-maven</artifactId>
228+
<version>${version.jib-layer-filter-extension-maven}</version>
229+
</dependency>
230+
</dependencies>
231+
</plugin>
232+
<plugin>
233+
<groupId>org.openapitools.openapidiff</groupId>
234+
<artifactId>openapi-diff-maven</artifactId>
235+
<version>${version.openapi-diff.plugin}</version>
236+
</plugin>
237+
<plugin>
238+
<groupId>org.openapitools</groupId>
239+
<artifactId>openapi-generator-maven-plugin</artifactId>
240+
<version>${version.openapi-generator.plugin}</version>
241+
</plugin>
242+
<plugin>
243+
<groupId>org.apache.maven.plugins</groupId>
244+
<artifactId>maven-antrun-plugin</artifactId>
245+
<version>${version.antrun.plugin}</version>
246+
</plugin>
247+
<plugin>
248+
<groupId>org.codehaus.mojo</groupId>
249+
<artifactId>exec-maven-plugin</artifactId>
250+
<version>${version.exec.plugin}</version>
251+
<configuration>
252+
<mainClass>ai.timefold.solver.model.config.ConfigDumperMain</mainClass>
253+
</configuration>
254+
</plugin>
255+
</plugins>
256+
</pluginManagement>
191257
<plugins>
192258
<plugin>
193259
<groupId>org.apache.maven.plugins</groupId>
@@ -218,40 +284,9 @@
218284
</execution>
219285
</executions>
220286
</plugin>
221-
<plugin>
222-
<groupId>com.google.cloud.tools</groupId>
223-
<artifactId>jib-maven-plugin</artifactId>
224-
<version>${version.google-jib}</version>
225-
<dependencies>
226-
<dependency>
227-
<groupId>com.google.cloud.tools</groupId>
228-
<artifactId>jib-layer-filter-extension-maven</artifactId>
229-
<version>${version.jib-layer-filter-extension-maven}</version>
230-
</dependency>
231-
</dependencies>
232-
</plugin>
233-
<plugin>
234-
<groupId>org.openapitools.openapidiff</groupId>
235-
<artifactId>openapi-diff-maven</artifactId>
236-
<version>${version.openapi-diff.plugin}</version>
237-
</plugin>
238-
<plugin>
239-
<groupId>org.openapitools</groupId>
240-
<artifactId>openapi-generator-maven-plugin</artifactId>
241-
<version>${version.openapi-generator.plugin}</version>
242-
</plugin>
243-
<plugin>
244-
<groupId>org.apache.maven.plugins</groupId>
245-
<artifactId>maven-antrun-plugin</artifactId>
246-
<version>${version.antrun.plugin}</version>
247-
</plugin>
248287
<plugin>
249288
<groupId>org.codehaus.mojo</groupId>
250-
<artifactId>exec-maven-plugin</artifactId>
251-
<version>${version.exec.plugin}</version>
252-
<configuration>
253-
<mainClass>ai.timefold.solver.model.config.ConfigDumperMain</mainClass>
254-
</configuration>
289+
<artifactId>flatten-maven-plugin</artifactId>
255290
</plugin>
256291
</plugins>
257292
</build>

0 commit comments

Comments
 (0)