Skip to content

Commit

Permalink
Finish moving lifecycle-mapping plugin into Eclipse specific profile
Browse files Browse the repository at this point in the history
As a part of #616
lifecycle-mapping has been move into eclipse specific profile in root
pom.xml, but unfortunately other places were missed.

Signed-off-by: Martin Perina <mperina@redhat.com>
  • Loading branch information
mwperina committed Sep 2, 2022
1 parent 0dabcf4 commit 6b0cdc3
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 64 deletions.
75 changes: 40 additions & 35 deletions ear/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -121,41 +121,6 @@
<build>
<finalName>engine</finalName>

<pluginManagement>
<plugins>

<!-- We need to ignore the execution of the maven-ear-plugin when
running inside Eclipse, as there is no Eclipse plugin supporting
most of the parameters that we use and this generates an error
when importing the project: -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<versionRange>[1.0,)</versionRange>
<goals>
<goal>generate-application-xml</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore/>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>

</plugins>
</pluginManagement>

<plugins>
<plugin>
<artifactId>maven-ear-plugin</artifactId>
Expand Down Expand Up @@ -249,4 +214,44 @@

</plugins>
</build>
<profiles>
<profile>
<id>only-eclipse</id>
<build>
<pluginManagement>
<plugins>

<!-- We need to ignore the execution of the maven-ear-plugin when
running inside Eclipse, as there is no Eclipse plugin supporting
most of the parameters that we use and this generates an error
when importing the project: -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<versionRange>[1.0,)</versionRange>
<goals>
<goal>generate-application-xml</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore/>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>
</project>
64 changes: 35 additions & 29 deletions frontend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,39 +20,45 @@
<engine.core.groupId>org.ovirt.engine.core</engine.core.groupId>
</properties>
<build>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<versionRange>[1.3.2.google,)</versionRange>
<goals>
<goal>resources</goal>
<goal>generateAsync</goal>
</goals>
</pluginExecutionFilter>
<action><ignore/></action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>only-eclipse</id>
<build>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
<versionRange>[1.3.2.google,)</versionRange>
<goals>
<goal>resources</goal>
<goal>generateAsync</goal>
</goals>
</pluginExecutionFilter>
<action><ignore/></action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>
</project>

0 comments on commit 6b0cdc3

Please sign in to comment.