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/10/06 00:44:50 UTC

[1/3] git commit: Overriding modernizer-plugin config in jclouds-resources

Repository: jclouds
Updated Branches:
  refs/heads/reactivate-checkstyle [created] 2df87cbad


Overriding modernizer-plugin config in jclouds-resources

This fixes a self-dependency


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/53589bd5
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/53589bd5
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/53589bd5

Branch: refs/heads/reactivate-checkstyle
Commit: 53589bd52a804f3ac73f1ce55d67b0be89afe611
Parents: ce76144
Author: Andrew Phillips <an...@apache.org>
Authored: Sun Oct 5 16:28:57 2014 -0500
Committer: Andrew Phillips <an...@apache.org>
Committed: Sun Oct 5 18:44:09 2014 -0400

----------------------------------------------------------------------
 resources/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/53589bd5/resources/pom.xml
----------------------------------------------------------------------
diff --git a/resources/pom.xml b/resources/pom.xml
index 6404210..6282650 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -41,5 +41,17 @@
         </includes>
       </resource>
     </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.gaul</groupId>
+        <artifactId>modernizer-maven-plugin</artifactId>
+        <configuration>
+          <javaVersion>1.7</javaVersion>
+          <!-- ${project.basedir} required here as 1.1.0 of the modernizer plugin
+            can't find the exclusions file otherwise -->
+          <exclusionsFile>${project.basedir}/modernizer_exclusions.txt</exclusionsFile>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>


[3/3] git commit: Overriding checkstyle-plugin config in jclouds-resources

Posted by an...@apache.org.
Overriding checkstyle-plugin config in jclouds-resources

Otherwise, fails with a self-dependency


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/2df87cba
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/2df87cba
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/2df87cba

Branch: refs/heads/reactivate-checkstyle
Commit: 2df87cbadd65637358b13ee225b1f732d39ca6c3
Parents: 36b872c
Author: Andrew Phillips <an...@apache.org>
Authored: Sun Oct 5 15:02:22 2014 -0500
Committer: Andrew Phillips <an...@apache.org>
Committed: Sun Oct 5 18:44:25 2014 -0400

----------------------------------------------------------------------
 project/pom.xml   |  2 --
 resources/pom.xml | 12 ++++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/2df87cba/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 52cbfed..c5e6693 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -1112,8 +1112,6 @@
               <includeTestSourceDirectory>true</includeTestSourceDirectory>
               <failOnViolation>true</failOnViolation>
               <failsOnError>true</failsOnError>
-              <!-- fails on itself as it uses the author tag in a module definition -->
-              <resourceExcludes>checkstyle.xml</resourceExcludes>
               <violationSeverity>warning</violationSeverity>
             </configuration>
           </plugin>

http://git-wip-us.apache.org/repos/asf/jclouds/blob/2df87cba/resources/pom.xml
----------------------------------------------------------------------
diff --git a/resources/pom.xml b/resources/pom.xml
index 6282650..a133e0c 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -43,6 +43,18 @@
     </resources>
     <plugins>
       <plugin>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <configLocation>checkstyle.xml</configLocation>
+          <includeTestSourceDirectory>true</includeTestSourceDirectory>
+          <failOnViolation>true</failOnViolation>
+          <failsOnError>true</failsOnError>
+          <!-- fails on itself as it uses the author tag in a module definition -->
+          <resourceExcludes>checkstyle.xml</resourceExcludes>
+          <violationSeverity>warning</violationSeverity>
+        </configuration>
+      </plugin>
+      <plugin>
         <groupId>org.gaul</groupId>
         <artifactId>modernizer-maven-plugin</artifactId>
         <configuration>


[2/3] git commit: Moving checkstyle-plugin config to profiles

Posted by an...@apache.org.
Moving checkstyle-plugin config to profiles


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/36b872c0
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/36b872c0
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/36b872c0

Branch: refs/heads/reactivate-checkstyle
Commit: 36b872c0031034e2116aa7be981fdb19b291d922
Parents: 53589bd
Author: Andrew Phillips <an...@apache.org>
Authored: Sun Oct 5 14:41:23 2014 -0500
Committer: Andrew Phillips <an...@apache.org>
Committed: Sun Oct 5 18:44:17 2014 -0400

----------------------------------------------------------------------
 project/pom.xml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/36b872c0/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 0372aaa..52cbfed 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -708,14 +708,7 @@
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>2.13</version>
-        <configuration>
-          <!-- configLocation configured via profiles -->
-          <violationSeverity>warning</violationSeverity>
-          <includeTestSourceDirectory>true</includeTestSourceDirectory>
-          <failOnViolation>true</failOnViolation>
-          <failsOnError>true</failsOnError>
-          <violationSeverity>warning</violationSeverity>
-        </configuration>
+        <!-- configuration and dependencies set via profiles -->
       </plugin>
       <plugin>
         <groupId>org.gaul</groupId>
@@ -1074,6 +1067,7 @@
             <artifactId>maven-checkstyle-plugin</artifactId>
             <configuration>
               <configLocation>../resources/checkstyle.xml</configLocation>
+              <includeTestSourceDirectory>true</includeTestSourceDirectory>
               <failOnViolation>true</failOnViolation>
               <failsOnError>true</failsOnError>
               <violationSeverity>warning</violationSeverity>
@@ -1115,6 +1109,7 @@
             <configuration>
               <!-- jclouds-resources has the checkstyle config in the classpath -->
               <configLocation>resources/checkstyle.xml</configLocation>
+              <includeTestSourceDirectory>true</includeTestSourceDirectory>
               <failOnViolation>true</failOnViolation>
               <failsOnError>true</failsOnError>
               <!-- fails on itself as it uses the author tag in a module definition -->