Merge branch release/0.3.0 into master

* 230c1ca Upgrade maven-pmd-plugin to 3.6
* ca82b4d Only use javadoc, source and deploy plugins in release profile

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
This commit is contained in:
Paul Campbell 2015-12-29 14:51:53 +00:00
commit 63f7c15011
2 changed files with 48 additions and 41 deletions

View file

@ -1,6 +1,12 @@
CHANGELOG CHANGELOG
========= =========
0.3.0
------
* * 230c1ca Upgrade maven-pmd-plugin to 3.6
* * ca82b4d Only use javadoc, source and deploy plugins in release profile
0.2.0 0.2.0
------ ------

83
pom.xml
View file

@ -4,7 +4,7 @@
<groupId>net.kemitix</groupId> <groupId>net.kemitix</groupId>
<artifactId>kemitix-parent</artifactId> <artifactId>kemitix-parent</artifactId>
<version>0.2.0</version> <version>0.3.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Kemitix Parent</name> <name>Kemitix Parent</name>
@ -52,7 +52,7 @@
<profiles> <profiles>
<profile> <profile>
<id>release-sign-artifacts</id> <id>release</id>
<activation> <activation>
<property> <property>
<name>performRelease</name> <name>performRelease</name>
@ -77,10 +77,46 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin><!-- maven-gpg-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin><!-- maven-source-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>verify</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin><!-- maven-javadoc-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin><!-- maven deploy-plugin -->
</plugins> </plugins>
</build> </build>
</profile><!-- release-sign-artifacts --> </profile><!-- release -->
</profiles> </profiles>
<build> <build>
@ -168,7 +204,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId> <artifactId>maven-pmd-plugin</artifactId>
<version>3.5</version> <version>3.6</version>
<executions> <executions>
<execution> <execution>
<id>pmd</id> <id>pmd</id>
@ -262,41 +298,6 @@
</rules> </rules>
</configuration> </configuration>
</plugin><!-- jacoco-maven-plugin --> </plugin><!-- jacoco-maven-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin><!-- maven-source-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>verify</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin><!-- maven-javadoc-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin><!-- maven deploy-plugin -->
</plugins> </plugins>
</build> </build>
@ -338,7 +339,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId> <artifactId>maven-pmd-plugin</artifactId>
<version>3.5</version> <version>3.6</version>
<configuration> <configuration>
<linkXref>true</linkXref> <linkXref>true</linkXref>
</configuration> </configuration>