You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2013/08/14 11:58:27 UTC
git commit: TAJO-128: Cleanup unused maven report plugin and add
surefire. (hyunsik)
Updated Branches:
refs/heads/master 9d0208839 -> 298ef3a9e
TAJO-128: Cleanup unused maven report plugin and add surefire. (hyunsik)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/298ef3a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/298ef3a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/298ef3a9
Branch: refs/heads/master
Commit: 298ef3a9e186e1bcd06077a34e00d1140273c335
Parents: 9d02088
Author: Hyunsik Choi <hy...@apache.org>
Authored: Wed Aug 14 16:34:11 2013 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Wed Aug 14 16:34:11 2013 +0900
----------------------------------------------------------------------
tajo-algebra/pom.xml | 16 +++----
tajo-catalog/pom.xml | 19 ++++++++
tajo-catalog/tajo-catalog-client/pom.xml | 16 +++----
tajo-catalog/tajo-catalog-common/pom.xml | 16 +++----
tajo-catalog/tajo-catalog-server/pom.xml | 16 +++----
tajo-common/pom.xml | 15 +++----
tajo-core/pom.xml | 15 +++----
tajo-core/tajo-core-backend/pom.xml | 63 +++------------------------
tajo-project/pom.xml | 18 +++++---
tajo-rpc/pom.xml | 15 +++----
10 files changed, 82 insertions(+), 127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/298ef3a9/tajo-algebra/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-algebra/pom.xml b/tajo-algebra/pom.xml
index 4aec192..f18ae7b 100644
--- a/tajo-algebra/pom.xml
+++ b/tajo-algebra/pom.xml
@@ -78,6 +78,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
+ </plugin>
</plugins>
</build>
@@ -228,14 +233,9 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
- <xmlOutputDirectory>target/findbugs</xmlOutputDirectory>
- <!--<excludeFilterFile>src/main/findbugs/findbugs-exclude.xml</excludeFilterFile>-->
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
</plugin>
</plugins>
</reporting>
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/298ef3a9/tajo-catalog/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/pom.xml b/tajo-catalog/pom.xml
index 3e595e8..bcc4a35 100644
--- a/tajo-catalog/pom.xml
+++ b/tajo-catalog/pom.xml
@@ -41,6 +41,16 @@
<module>tajo-catalog-client</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
+ </plugin>
+ </plugins>
+ </build>
+
<profiles>
<profile>
<id>docs</id>
@@ -155,4 +165,13 @@
</profile>
</profiles>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/298ef3a9/tajo-catalog/tajo-catalog-client/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-client/pom.xml b/tajo-catalog/tajo-catalog-client/pom.xml
index 7f2eba6..0bee281 100644
--- a/tajo-catalog/tajo-catalog-client/pom.xml
+++ b/tajo-catalog/tajo-catalog-client/pom.xml
@@ -105,6 +105,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
+ </plugin>
</plugins>
</build>
@@ -202,14 +207,9 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
- <xmlOutputDirectory>target/findbugs</xmlOutputDirectory>
- <!--<excludeFilterFile>src/main/findbugs/findbugs-exclude.xml</excludeFilterFile>-->
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
</plugin>
</plugins>
</reporting>
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/298ef3a9/tajo-catalog/tajo-catalog-common/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-common/pom.xml b/tajo-catalog/tajo-catalog-common/pom.xml
index 577f196..6065b8d 100644
--- a/tajo-catalog/tajo-catalog-common/pom.xml
+++ b/tajo-catalog/tajo-catalog-common/pom.xml
@@ -124,6 +124,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
+ </plugin>
</plugins>
</build>
@@ -217,14 +222,9 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
- <xmlOutputDirectory>target/findbugs</xmlOutputDirectory>
- <!--<excludeFilterFile>src/main/findbugs/findbugs-exclude.xml</excludeFilterFile>-->
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
</plugin>
</plugins>
</reporting>
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/298ef3a9/tajo-catalog/tajo-catalog-server/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/pom.xml b/tajo-catalog/tajo-catalog-server/pom.xml
index ae134ad..14adba8 100644
--- a/tajo-catalog/tajo-catalog-server/pom.xml
+++ b/tajo-catalog/tajo-catalog-server/pom.xml
@@ -102,6 +102,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
+ </plugin>
</plugins>
</build>
@@ -203,14 +208,9 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
- <xmlOutputDirectory>target/findbugs</xmlOutputDirectory>
- <!--<excludeFilterFile>src/main/findbugs/findbugs-exclude.xml</excludeFilterFile>-->
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
</plugin>
</plugins>
</reporting>
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/298ef3a9/tajo-common/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-common/pom.xml b/tajo-common/pom.xml
index c380f4a..4f25143 100644
--- a/tajo-common/pom.xml
+++ b/tajo-common/pom.xml
@@ -119,8 +119,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
</plugin>
</plugins>
</build>
@@ -277,14 +277,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
- <xmlOutputDirectory>target/findbugs</xmlOutputDirectory>
- <!--<excludeFilterFile>src/main/findbugs/findbugs-exclude.xml</excludeFilterFile>-->
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
</plugin>
</plugins>
</reporting>
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/298ef3a9/tajo-core/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-core/pom.xml b/tajo-core/pom.xml
index 0206f62..b7cd9f7 100644
--- a/tajo-core/pom.xml
+++ b/tajo-core/pom.xml
@@ -73,8 +73,8 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
</plugin>
</plugins>
</build>
@@ -187,14 +187,9 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
- <xmlOutputDirectory>target/findbugs</xmlOutputDirectory>
- <excludeFilterFile>src/main/findbugs/findbugs-exclude.xml</excludeFilterFile>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
</plugin>
</plugins>
</reporting>
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/298ef3a9/tajo-core/tajo-core-backend/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/pom.xml b/tajo-core/tajo-core-backend/pom.xml
index 541b4d4..ba5ad9f 100644
--- a/tajo-core/tajo-core-backend/pom.xml
+++ b/tajo-core/tajo-core-backend/pom.xml
@@ -63,58 +63,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12.4</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>2.12.4</version>
- </dependency>
- </dependencies>
<configuration>
- <excludedGroups>org.apache.tajo.IntegrationTest</excludedGroups>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.12.4</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>2.12.4</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>
- <include>**/*.class</include>
- </includes>
- <groups>org.apache.tajo.IntegrationTest</groups>
- <!--
- <environmentVariables>
- <TAJO_CLASSPATH>${project.basedir}/../../tajo-dist/target/tajo-${project.version}/*:${project.basedir}/../../tajo-dist/target/tajo-${project.version}/lib/*</TAJO_CLASSPATH>
- <RUNTIME_CLASSPATH>${runtime_classpath}</RUNTIME_CLASSPATH>
- </environmentVariables>
- -->
-
<systemProperties>
<tajo.test>TRUE</tajo.test>
</systemProperties>
-
- <!--
- <additionalClasspathElements>
- <additionalClasspathElement>${project.basedir}/target/*</additionalClasspathElement>
- <additionalClasspathElement>${project.basedir}/target/lib/*</additionalClasspathElement>
- </additionalClasspathElements>
- -->
</configuration>
</plugin>
<plugin>
@@ -456,16 +408,6 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
- <xmlOutputDirectory>target/findbugs</xmlOutputDirectory>
- <!--<excludeFilterFile>src/main/findbugs/findbugs-exclude.xml</excludeFilterFile>-->
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.4</version>
@@ -473,6 +415,11 @@
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
+ </plugin>
</plugins>
</reporting>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/298ef3a9/tajo-project/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-project/pom.xml b/tajo-project/pom.xml
index 068623a..a0b510f 100644
--- a/tajo-project/pom.xml
+++ b/tajo-project/pom.xml
@@ -328,6 +328,11 @@
<artifactId>antlr4-maven-plugin</artifactId>
<version>4.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
+ </plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only.
It has no influence on the Maven build itself. -->
<plugin>
@@ -494,7 +499,8 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
</plugin>
</plugins>
</build>
@@ -840,13 +846,11 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
<configuration>
- <xmlOutput>true</xmlOutput>
- <xmlOutputDirectory>target/findbugs</xmlOutputDirectory>
- <!--<excludeFilterFile>src/main/findbugs/findbugs-exclude.xml</excludeFilterFile>-->
+ <aggregate>true</aggregate>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/298ef3a9/tajo-rpc/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-rpc/pom.xml b/tajo-rpc/pom.xml
index 6875291..4f8cada 100644
--- a/tajo-rpc/pom.xml
+++ b/tajo-rpc/pom.xml
@@ -119,8 +119,8 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
</plugin>
</plugins>
</build>
@@ -283,14 +283,9 @@
<reporting>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
- <xmlOutputDirectory>target/findbugs</xmlOutputDirectory>
- <!--<excludeFilterFile>src/main/findbugs/findbugs-exclude.xml</excludeFilterFile>-->
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.15</version>
</plugin>
</plugins>
</reporting>