You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/02/12 06:57:24 UTC
[3/5] git commit: Moving dependencies for the Checkstyle plugin into
a profile
Moving dependencies for the Checkstyle plugin into a profile
Follow-on from 335f594
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/5f7a4aa5
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/5f7a4aa5
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/5f7a4aa5
Branch: refs/heads/cleanup-5976159-1.7.x
Commit: 5f7a4aa5bf68cf1011ed7142265effc37c95908b
Parents: bf46260
Author: Andrew Phillips <an...@apache.org>
Authored: Tue Feb 11 20:30:56 2014 -0500
Committer: Andrew Phillips <an...@apache.org>
Committed: Wed Feb 12 00:55:06 2014 -0500
----------------------------------------------------------------------
project/pom.xml | 40 ++++++++++++++++++++++++++++------------
1 file changed, 28 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/5f7a4aa5/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 21de3e7..56ead21 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -668,16 +668,8 @@
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.11</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-resources</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
<configuration>
- <!-- jclouds-resources has the checkstyle config in the classpath -->
- <configLocation>resources/checkstyle.xml</configLocation>
+ <!-- configLocation configured via profiles -->
<violationSeverity>warning</violationSeverity>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
@@ -1003,11 +995,35 @@
<plugin>
<!-- When building jclouds-project, override the config to use the local file -->
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.11</version>
<configuration>
<configLocation>../resources/checkstyle.xml</configLocation>
- <violationSeverity>warning</violationSeverity>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>not-jclouds-project</id>
+ <activation>
+ <file>
+ <!-- only in the jclouds-project module -->
+ <missing>src/etc/header.txt</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <!-- jclouds-resources has the checkstyle config in the classpath -->
+ <configLocation>resources/checkstyle.xml</configLocation>
</configuration>
</plugin>
</plugins>