Housekeeping, properly declare required maven version and update build plugin versions to recent versions

This commit is contained in:
Hugo Trippaers 2015-01-06 11:58:58 +01:00
parent 84c44b6314
commit ec32ea30f7
4 changed files with 35 additions and 18 deletions

View File

@ -70,7 +70,6 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration> <configuration>
<executable>java</executable> <executable>java</executable>
<mainClass>com.cloud.agent.AgentShell</mainClass> <mainClass>com.cloud.agent.AgentShell</mainClass>
@ -124,7 +123,6 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<executions> <executions>
<execution> <execution>
<phase>compile</phase> <phase>compile</phase>
@ -144,7 +142,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version>
<configuration> <configuration>
<excludes> <excludes>
<exclude>none</exclude> <exclude>none</exclude>

View File

@ -24,7 +24,7 @@
<plugin> <plugin>
<groupId>org.codehaus.gmaven</groupId> <groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId> <artifactId>gmaven-plugin</artifactId>
<version>1.3</version> <version>1.5</version>
<configuration> <configuration>
<providerSelection>1.7</providerSelection> <providerSelection>1.7</providerSelection>
</configuration> </configuration>

40
pom.xml
View File

@ -33,6 +33,10 @@
<url>https://issues.apache.org/jira/browse/CLOUDSTACK</url> <url>https://issues.apache.org/jira/browse/CLOUDSTACK</url>
</issueManagement> </issueManagement>
<prerequisites>
<maven>3.0.4</maven>
</prerequisites>
<properties> <properties>
<cs.jdk.version>1.7</cs.jdk.version> <cs.jdk.version>1.7</cs.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -92,10 +96,10 @@
<cs.target.dir>target</cs.target.dir> <cs.target.dir>target</cs.target.dir>
<cs.daemon.version>1.0.15</cs.daemon.version> <cs.daemon.version>1.0.15</cs.daemon.version>
<cs.jna.version>4.0.0</cs.jna.version> <cs.jna.version>4.0.0</cs.jna.version>
<cs.checkstyle.version>2.11</cs.checkstyle.version> <cs.checkstyle.version>2.13</cs.checkstyle.version>
<cs.mycila.license.version>2.5</cs.mycila.license.version> <cs.mycila.license.version>2.7</cs.mycila.license.version>
<cs.findbugs.version>2.5.3</cs.findbugs.version> <cs.findbugs.version>3.0.0</cs.findbugs.version>
<cs.javadoc.version>2.9.1</cs.javadoc.version> <cs.javadoc.version>2.10.1</cs.javadoc.version>
<cs.opensaml.version>2.6.1</cs.opensaml.version> <cs.opensaml.version>2.6.1</cs.opensaml.version>
</properties> </properties>
@ -612,7 +616,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.2.1</version> <version>2.5.1</version>
<executions> <executions>
<execution> <execution>
<id>default</id> <id>default</id>
@ -695,12 +699,12 @@
<plugin> <plugin>
<groupId>org.apache.tomcat.maven</groupId> <groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId> <artifactId>tomcat7-maven-plugin</artifactId>
<version>2.0</version> <version>2.2</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version> <version>1.8</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
@ -837,7 +841,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version> <version>3.2</version>
<configuration> <configuration>
<source>${cs.jdk.version}</source> <source>${cs.jdk.version}</source>
<target>${cs.jdk.version}</target> <target>${cs.jdk.version}</target>
@ -850,7 +854,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.4</version> <version>2.5</version>
<configuration> <configuration>
<archive> <archive>
<manifest> <manifest>
@ -863,7 +867,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version> <version>1.9.1</version>
<executions> <executions>
<execution> <execution>
<id>remove-old-installers</id> <id>remove-old-installers</id>
@ -879,7 +883,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>2.5.1</version> <version>2.9</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
@ -922,7 +926,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.1</version> <version>3.3</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
@ -946,6 +950,16 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.18.1</version>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
@ -983,7 +997,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<version>3.3</version> <version>3.4</version>
</plugin> </plugin>
</plugins> </plugins>
</reporting> </reporting>

View File

@ -25,12 +25,18 @@
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>checkstyle</artifactId> <artifactId>checkstyle</artifactId>
<version>4.6.0-SNAPSHOT</version> <version>4.6.0-SNAPSHOT</version>
<prerequisites>
<maven>3.0.4</maven>
</prerequisites>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>2.11</version> <version>2.13</version>
<executions> <executions>
<execution> <execution>
<phase>none</phase> <phase>none</phase>