accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject git commit: Revert "ACCUMULO-1030 - accumulo-maven-plugin skipped with skipTests"
Date Wed, 30 Oct 2013 23:08:16 GMT
Updated Branches:
  refs/heads/master bc24925b2 -> 2bedf7bfe


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

This reverts commit 9d6da9698d7a8ae35fa72ce0b48caa0e8124c497.

This commit was done to fix ACCUMULO-1675, but does not correctly do
that. ACCUMULO-1675 was supposed to skip execution of the plugin on a
project that uses it. It was *NOT* supposed to offer a way to avoid
building the plugin itself. Even if we skip tests in the Accumulo build,
we *still* need to build/package/install/deploy this plugin.

To correctly fix ACCUMULO-1675, we need to modify the plugin itself to
behave differently upon encountering -DskipTests (or another similar
flag) on a project that uses this plugin for integration testing against
Accumulo.


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

Branch: refs/heads/master
Commit: 2bedf7bfecfd2d7945e1573d3f09451e85dc1e17
Parents: bc24925
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Oct 30 19:05:04 2013 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Oct 30 19:05:04 2013 -0400

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2bedf7bf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e12c597..2f22e73 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,6 +83,7 @@
     <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>
@@ -668,7 +669,7 @@
               <goal>verify</goal>
             </goals>
             <configuration>
-              <!--parallel>classes</parallel -->
+              <!--parallel>classes</parallel-->
               <reuseForks>false</reuseForks>
               <forkMode>perthread</forkMode>
               <perCoreThreadCount>false</perCoreThreadCount>
@@ -867,7 +868,8 @@
       </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>
@@ -877,7 +879,7 @@
     </profile>
     <profile>
       <!-- Generate cobertura reports with site.
-        Activate with -P cobertura -->
+           Activate with -P cobertura -->
       <id>cobertura</id>
       <reporting>
         <plugins>
@@ -897,7 +899,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>
@@ -913,7 +915,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>
@@ -926,49 +928,5 @@
         <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/2bedf7bf/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 8339f00..d1e6981 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -122,6 +122,11 @@
       <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>
@@ -205,7 +210,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>
@@ -223,7 +228,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>
@@ -238,20 +243,5 @@
         </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