Skip to content

Commit

Permalink
pom: align dependencies when using different maven versions
Browse files Browse the repository at this point in the history
Set a parent in ovirt-findbugs-filters to make sure we pull same
dependencies there as in the root project.

Move ovirt-findbugs-filters to a plugin to avoid a cyclic dependency
when building.

Pin a version for maven-install-plugin.

This all to make sure we build using the same dependencies on all OS'es.
We need this for example on COPR to have correct dependencies included
in ovirt-engine-build-dependencies, as the srpm is build there on FC41
which has different plugin versions in its Super POM.

Signed-off-by: Jean-Louis Dupond <jean-louis@dupond.be>
  • Loading branch information
dupondje committed Feb 11, 2025
1 parent 5f765e7 commit 44fa660
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 7 deletions.
6 changes: 6 additions & 0 deletions build-tools-root/ovirt-findbugs-filters/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ SPDX-License-Identifier: Apache-2.0

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.ovirt.engine</groupId>
<artifactId>build-tools-root</artifactId>
<version>4.5.7-SNAPSHOT</version>
</parent>

<groupId>org.ovirt.engine</groupId>
<artifactId>ovirt-findbugs-filters</artifactId>
<version>4.5.7-SNAPSHOT</version>
Expand Down
21 changes: 14 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
<maven-ear-plugin.version>3.2.0</maven-ear-plugin.version>
<maven-ejb-plugin.version>3.2.1</maven-ejb-plugin.version>
<maven-enforcer-plugin.version>3.1.0</maven-enforcer-plugin.version>
<maven-install-plugin.version>3.1.1</maven-install-plugin.version>
<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
<maven-processor-plugin.version>4.5</maven-processor-plugin.version>
<maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
Expand Down Expand Up @@ -1044,6 +1045,12 @@
<version>${maven-enforcer-plugin.version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${maven-install-plugin.version}</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
Expand All @@ -1058,14 +1065,14 @@
<xmlOutput>true</xmlOutput>
<xmlOutputDirectory>target/site</xmlOutputDirectory>
<excludeFilterFile>exclude-filters-general.xml, ${project.basedir}/exclude-filters.xml</excludeFilterFile>
<plugins>
<plugin>
<groupId>org.ovirt.engine</groupId>
<artifactId>ovirt-findbugs-filters</artifactId>
<version>4.5.7-SNAPSHOT</version>
</plugin>
</plugins>
</configuration>
<dependencies>
<dependency>
<groupId>org.ovirt.engine</groupId>
<artifactId>ovirt-findbugs-filters</artifactId>
<version>4.5.7-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down

0 comments on commit 44fa660

Please sign in to comment.