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/07 00:31:07 UTC

[30/52] [abbrv] git commit: Overriding modernizer-plugin exclusion file location for jclouds-project

Overriding modernizer-plugin exclusion file location for jclouds-project

Needs to use the local exclusions file, not the one from the
jclouds-resources dep (which is not present in jclouds-project)


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

Branch: refs/heads/use-agentproxy-008
Commit: ce76144e3b0061775a76052302df1f5760e6e26c
Parents: 79d4b48
Author: Andrew Phillips <an...@apache.org>
Authored: Sun Oct 5 14:30:33 2014 -0500
Committer: Andrew Phillips <an...@apache.org>
Committed: Sun Oct 5 18:36:15 2014 -0400

----------------------------------------------------------------------
 project/pom.xml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/ce76144e/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index c799d04..0372aaa 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -721,6 +721,7 @@
         <groupId>org.gaul</groupId>
         <artifactId>modernizer-maven-plugin</artifactId>
         <version>1.1.0</version>
+        <!-- configuration and dependencies set via profiles -->
         <executions>
           <execution>
             <id>modernizer</id>
@@ -730,10 +731,6 @@
             </goals>
           </execution>
         </executions>
-        <configuration>
-          <javaVersion>1.7</javaVersion>
-          <exclusionsFile>resources/modernizer_exclusions.txt</exclusionsFile>
-        </configuration>
       </plugin>
     </plugins>
     <pluginManagement>
@@ -1082,6 +1079,17 @@
               <violationSeverity>warning</violationSeverity>
             </configuration>
           </plugin>
+          <plugin>
+            <groupId>org.gaul</groupId>
+            <artifactId>modernizer-maven-plugin</artifactId>
+            <configuration>
+              <javaVersion>1.7</javaVersion>
+              <!-- in jclouds-project use the local file. ${project.basedir}
+                required here as 1.1.0 of the modernizer plugin can't find the
+                exclusions file otherwise -->
+              <exclusionsFile>${project.basedir}/../resources/modernizer_exclusions.txt</exclusionsFile>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
     </profile>
@@ -1124,6 +1132,10 @@
                 <version>${project.version}</version>
               </dependency>
             </dependencies>
+            <configuration>
+              <javaVersion>1.7</javaVersion>
+              <exclusionsFile>resources/modernizer_exclusions.txt</exclusionsFile>
+            </configuration>
           </plugin>
         </plugins>
       </build>