Author: tv
Date: Fri Dec 9 15:22:14 2016
New Revision: 1773412
URL: http://svn.apache.org/viewvc?rev=1773412&view=rev
Log:
- Add Java8-comaptible FindBugs version to Java8 profile
- Use turbine-parent-assembly for assembly descriptors
Modified:
turbine/maven/turbine-parent/trunk/pom.xml
Modified: turbine/maven/turbine-parent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/maven/turbine-parent/trunk/pom.xml?rev=1773412&r1=1773411&r2=1773412&view=diff
==============================================================================
--- turbine/maven/turbine-parent/trunk/pom.xml (original)
+++ turbine/maven/turbine-parent/trunk/pom.xml Fri Dec 9 15:22:14 2016
@@ -248,7 +248,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.4</version>
+ <version>${turbine.findbugs.version}</version>
<configuration>
<threshold>Normal</threshold>
</configuration>
@@ -378,6 +378,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.turbine</groupId>
+ <artifactId>turbine-parent-assembly</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
<!-- Disable Apache Parent POM built-in source assembly -->
<executions>
<execution>
@@ -386,6 +393,21 @@
<skipAssembly>true</skipAssembly>
</configuration>
</execution>
+ <execution>
+ <id>turbine-default-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptorRefs>
+ <descriptorRef>binaries-default</descriptorRef>
+ <descriptorRef>source-default</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileFormat>gnu</tarLongFileFormat>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -430,12 +452,14 @@
</build>
</profile>
<!-- ignore doclint errors (should be warnings) for site generation, if
using java 8 or above -->
+ <!-- Use java 8 compatible version of FindBugs -->
<profile>
- <id>no-doclint</id>
+ <id>java8</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<properties>
+ <turbine.findbugs.version>3.0.1</turbine.findbugs.version>
<additionalparam>-Xdoclint:none</additionalparam>
</properties>
</profile>
@@ -464,6 +488,7 @@
<turbine.project-info.version>2.9</turbine.project-info.version>
<turbine.wagon-ssh.version>2.10</turbine.wagon-ssh.version>
<turbine.site.version>3.4</turbine.site.version>
+ <turbine.findbugs.version>2.5.4</turbine.findbugs.version>
<!--
Encoding of Java source files: Make sure, that the compiler and
