accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject git commit: ACCUMULO-1030 - accumulo-maven-plugin skipped with skipTests
Date Wed, 30 Oct 2013 21:54:46 GMT
Updated Branches:
  refs/heads/master b4c86bd98 -> 9d6da9698


ACCUMULO-1030 - accumulo-maven-plugin skipped with skipTests


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

Branch: refs/heads/master
Commit: 9d6da9698d7a8ae35fa72ce0b48caa0e8124c497
Parents: b4c86bd
Author: John Vines <jvines@gmail.com>
Authored: Wed Oct 30 17:51:53 2013 -0400
Committer: John Vines <jvines@gmail.com>
Committed: Wed Oct 30 17:54:20 2013 -0400

----------------------------------------------------------------------
 pom.xml      | 62 ++++++++++++++++++++++++++++++++++++++++++++++---------
 test/pom.xml | 24 ++++++++++++++-------
 2 files changed, 69 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d6da969/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2f22e73..e12c597 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
+  contributor license agreements. See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
+  the License. You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+  http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -83,7 +83,6 @@
     <module>test</module>
     <module>minicluster</module>
     <module>docs</module>
-    <module>maven-plugin</module>
   </modules>
   <scm>
     <connection>scm:git:git://git.apache.org/accumulo.git</connection>
@@ -669,7 +668,7 @@
               <goal>verify</goal>
             </goals>
             <configuration>
-              <!--parallel>classes</parallel-->
+              <!--parallel>classes</parallel -->
               <reuseForks>false</reuseForks>
               <forkMode>perthread</forkMode>
               <perCoreThreadCount>false</perCoreThreadCount>
@@ -868,8 +867,7 @@
       </build>
     </profile>
     <profile>
-      <!-- Seal jars and skip tests when the
-           apache-release profile is activated. -->
+      <!-- Seal jars and skip tests when the apache-release profile is activated. -->
       <id>seal-jars</id>
       <properties>
         <sealJars>true</sealJars>
@@ -879,7 +877,7 @@
     </profile>
     <profile>
       <!-- Generate cobertura reports with site.
-           Activate with -P cobertura -->
+        Activate with -P cobertura -->
       <id>cobertura</id>
       <reporting>
         <plugins>
@@ -899,7 +897,7 @@
     </profile>
     <profile>
       <!-- profile for building against Hadoop 1.2.x
-      Activate using: mvn -Dhadoop.profile=1.2 -->
+        Activate using: mvn -Dhadoop.profile=1.2 -->
       <id>hadoop-1.2</id>
       <activation>
         <property>
@@ -915,7 +913,7 @@
     </profile>
     <profile>
       <!-- profile for building against Hadoop 2.2.x
-      Activate by not specifying hadoop.profile -->
+        Activate by not specifying hadoop.profile -->
       <id>hadoop-2.2</id>
       <activation>
         <property>
@@ -928,5 +926,49 @@
         <slf4j.version>1.7.5</slf4j.version>
       </properties>
     </profile>
+    <profile>
+      <id>use-maven-plugin</id>
+      <activation>
+        <property>
+          <name>!skipTests</name>
+        </property>
+      </activation>
+      <modules>
+        <module>maven-plugin</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>rat-ignore-maven-plugin</id>
+      <activation>
+        <property>
+          <name>skipTests</name>
+        </property>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.rat</groupId>
+              <artifactId>apache-rat-plugin</artifactId>
+              <configuration>
+                <excludes>
+                  <exclude>maven-plugin/target/**</exclude>
+                  <exclude>maven-plugin/.*</exclude>
+                  <exclude>maven-plugin/.settings/**</exclude>
+                </excludes>
+              </configuration>
+              <executions>
+                <execution>
+                  <goals>
+                    <goal>check</goal>
+                  </goals>
+                  <phase>verify</phase>
+                </execution>
+              </executions>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
   </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d6da969/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index d1e6981..8339f00 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -122,11 +122,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-maven-plugin</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-frontend-jaxrs</artifactId>
       <version>2.5.0</version>
@@ -210,7 +205,7 @@
     </profile>
     <profile>
       <!-- profile for building against Hadoop 1.2.x
-      Activate using: mvn -Dhadoop.profile=1.2 -->
+        Activate using: mvn -Dhadoop.profile=1.2 -->
       <id>hadoop-1.2</id>
       <activation>
         <property>
@@ -228,7 +223,7 @@
     </profile>
     <profile>
       <!-- profile for building against Hadoop 2.2.x
-      Activate by not specifying hadoop.profile -->
+        Activate by not specifying hadoop.profile -->
       <id>hadoop-2.2</id>
       <activation>
         <property>
@@ -243,5 +238,20 @@
         </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <id>use-maven-plugin</id>
+      <activation>
+        <property>
+          <name>!skipTests</name>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.accumulo</groupId>
+          <artifactId>accumulo-maven-plugin</artifactId>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 </project>


Mime
View raw message