opendev
/
gerrit
Code Issues Proposed changes

Avoid duplicate antrun blocks in pom.xml 

Declaring the same plugin twice may not be supported in future
versions of Maven. Try to prevent unexpected issues by putting
everything into one block.

Change-Id: I52e2964ed25e67010dfb04dbf8fcd69f4e68ff57
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce 2011-04-06 16:36:36 -04:00
parent 26fa03356a
commit 15779d950d
1 changed files with 28 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
gerrit-war/pom.xml
View File

@ -99,54 +99,6 @@ limitations under the License.
</dependency>
</dependencies>
<profiles>
<profile>
<id>include-documentation-profile</id>
<activation>
<property>
<name>gerrit.include-documentation</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>include-documentation</id>
<phase>process-classes</phase>
<configuration>
<target>
<property name="src" location="${basedir}/../Documentation" />
<property name="out" location="${project.build.directory}/${project.build.finalName}" />
<property name="dst" location="${out}/Documentation" />
<exec dir="${src}" executable="make">
<arg value="VERSION=${project.version}" />
<arg value="clean" />
<arg value="all" />
</exec>
<mkdir dir="${dst}" />
<copy overwrite="true" todir="${dst}">
<fileset dir="${src}">
<include name="*.html" />
</fileset>
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<build>
<plugins>
<plugin>
@ -183,7 +135,7 @@ limitations under the License.
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>fix-output</id>
<id>copy-license</id>
<phase>process-classes</phase>
<configuration>
<target>
@ -199,6 +151,33 @@ limitations under the License.
<goal>run</goal>
</goals>
</execution>
<execution>
<id>include-documentation</id>
<phase>process-classes</phase>
<configuration>
<target if="gerrit.include-documentation">
<property name="src" location="${basedir}/../Documentation" />
<property name="out" location="${project.build.directory}/${project.build.finalName}" />
<property name="dst" location="${out}/Documentation" />
<exec dir="${src}" executable="make">
<arg value="VERSION=${project.version}" />
<arg value="clean" />
<arg value="all" />
</exec>
<mkdir dir="${dst}" />
<copy overwrite="true" todir="${dst}">
<fileset dir="${src}">
<include name="*.html" />
</fileset>
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>