helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kisho...@apache.org
Subject git commit: [HELIX-77] Applying patch from Max to clean up pom and separate unit tests from integration test
Date Fri, 05 Apr 2013 04:47:24 GMT
Updated Branches:
  refs/heads/master d026f1982 -> 6ffeb30b6


[HELIX-77] Applying patch from Max to clean up pom and separate unit tests from integration
test


Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/6ffeb30b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/6ffeb30b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/6ffeb30b

Branch: refs/heads/master
Commit: 6ffeb30b69203827f8333ad8a625b80b46d6facd
Parents: d026f19
Author: Kishore Gopalakrishna <g.kishore@gmail.com>
Authored: Thu Apr 4 21:47:09 2013 -0700
Committer: Kishore Gopalakrishna <g.kishore@gmail.com>
Committed: Thu Apr 4 21:47:09 2013 -0700

----------------------------------------------------------------------
 helix-admin-webapp/pom.xml                   |    1 -
 pom.xml                                      |   97 ++++++++++++++++++---
 recipes/distributed-lock-manager/pom.xml     |    1 -
 recipes/rsync-replicated-file-system/pom.xml |    1 -
 4 files changed, 84 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/6ffeb30b/helix-admin-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/pom.xml b/helix-admin-webapp/pom.xml
index db463ae..26553f9 100644
--- a/helix-admin-webapp/pom.xml
+++ b/helix-admin-webapp/pom.xml
@@ -67,7 +67,6 @@ under the License.
     <dependency>
       <groupId>org.apache.helix</groupId>
       <artifactId>helix-core</artifactId>
-      <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/6ffeb30b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 449e18f..3396928 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,7 +207,15 @@ under the License.
     <currentRelease>0.6.0-incubating</currentRelease>
 
     <!--Skips test in default 'mvn clean install' build command-->
-    <maven.test.skip.exec>true</maven.test.skip.exec>
+    <!-- <maven.test.skip.exec>true</maven.test.skip.exec> -->
+    
+    <!--  Configuration for unit/integration tests section 1 of 3 (properties) STARTS
HERE.
+    Property for running integration tests with profiles
+    at the command line, where you do:
+    mvn integration-test -P integration-test
+    See also: the surefire plugin section and the profiles section.-->
+    <SKIP_INTEGRATION_TESTS>true</SKIP_INTEGRATION_TESTS>
+    <!-- Configuration for unit/integration tests section 1 of 3 (properties) ENDS HERE.-->
 
   </properties>
 
@@ -231,6 +239,12 @@ under the License.
         <version>${project.version}</version>
       </dependency>
       <dependency>
+         <groupId>org.apache.helix</groupId>
+         <artifactId>helix-core</artifactId>
+         <type>test-jar</type>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
         <version>1.2.15</version>
@@ -354,17 +368,6 @@ under the License.
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.14</version>
-          <configuration>
-            <argLine>-Xms1024m -Xmx1024m</argLine>
-            <suiteXmlFiles>
-              <suiteXmlFile>src/test/conf/testng.xml</suiteXmlFile>
-            </suiteXmlFiles>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
           <version>2.8</version>
         </plugin>
@@ -396,6 +399,16 @@ under the License.
             </dependency>
           </dependencies>
         </plugin>
+        <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-surefire-plugin</artifactId>
+           <version>2.14</version>
+        </plugin>
+        <plugin>
+           <groupId>org.apache.rat</groupId>
+           <artifactId>apache-rat-plugin</artifactId>
+           <version>0.8</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -421,6 +434,44 @@ under the License.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
       </plugin>
+      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-surefire-plugin</artifactId>
+         <!--
+               Configuration for unit/integration tests section 2 of 3 (plugins) STARTS HERE.
+               This is the core piece for being able to manage unit tests and
+               integration (='system') tests within Maven by using surefire.
+               See also: properties section and profiles section.
+         -->
+         <configuration>
+            <argLine>-Xms1024m -Xmx1024m</argLine>
+            <suiteXmlFiles>
+               <suiteXmlFile>src/test/conf/testng.xml</suiteXmlFile>
+            </suiteXmlFiles>
+            <excludes>
+               <exclude>**/integration/**</exclude>
+            </excludes>
+         </configuration>
+         <executions>
+            <execution>
+               <id>integration-tests</id>
+               <phase>integration-test</phase>
+               <goals>
+                  <goal>test</goal>
+               </goals>
+               <configuration>
+                  <skip>${SKIP_INTEGRATION_TESTS}</skip>
+                  <excludes>
+                     <exclude>none</exclude>
+                  </excludes>
+                  <includes>
+                     <include>**/integration/**</include>
+                  </includes>
+               </configuration>
+            </execution>
+         </executions>
+         <!--  Configuration for unit/integration tests section 2 of 3 (plugins) ENDS
HERE. -->
+      </plugin>
     </plugins>
   </build>
   <reporting>
@@ -534,7 +585,6 @@ under the License.
           <plugin>
             <groupId>org.apache.rat</groupId>
             <artifactId>apache-rat-plugin</artifactId>
-            <version>0.8</version>
             <executions>
               <execution>
                 <id>rat-verify</id>
@@ -566,5 +616,26 @@ under the License.
         </plugins>
       </build>
     </profile>
+      <!--
+      Configuration for unit/integration tests section 3 of 3 (profiles) STARTS HERE.
+      Use the following profile to run Integration tests. From the command line:
+      mvn clean install -P integration-test
+      or:
+      mvn integration-test -P integration-test
+      * Note that if you do: 'mvn test -P integration-test'
+      integration tests will not run, because the test phase is before the
+      integration phase in the default maven lifecycle.
+      * Also note that unit tests will also be run when integration tests are
+      run, because the integration-test phase is always after the test phase
+      in the default Maven lifecycle.
+      See also: surefire plugin section and properties section.
+      -->
+      <profile>
+         <id>integration-test</id>
+         <properties>
+            <SKIP_INTEGRATION_TESTS>false</SKIP_INTEGRATION_TESTS>
+         </properties>
+      </profile>
+      <!-- Configuration for unit/integration tests section 3 of 3 (profiles) ENDS HERE.-->
   </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/6ffeb30b/recipes/distributed-lock-manager/pom.xml
----------------------------------------------------------------------
diff --git a/recipes/distributed-lock-manager/pom.xml b/recipes/distributed-lock-manager/pom.xml
index 3797655..d7996e7 100644
--- a/recipes/distributed-lock-manager/pom.xml
+++ b/recipes/distributed-lock-manager/pom.xml
@@ -35,7 +35,6 @@ under the License.
     <dependency>
       <groupId>org.apache.helix</groupId>
       <artifactId>helix-core</artifactId>
-      <version>0.6.1-incubating-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/6ffeb30b/recipes/rsync-replicated-file-system/pom.xml
----------------------------------------------------------------------
diff --git a/recipes/rsync-replicated-file-system/pom.xml b/recipes/rsync-replicated-file-system/pom.xml
index 05f02c8..82607a3 100644
--- a/recipes/rsync-replicated-file-system/pom.xml
+++ b/recipes/rsync-replicated-file-system/pom.xml
@@ -40,7 +40,6 @@ under the License.
     <dependency>
       <groupId>org.apache.helix</groupId>
       <artifactId>helix-core</artifactId>
-      <version>0.6.1-incubating-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>


Mime
View raw message