Skip to content

[TACHYON-442] Apply PluginManagement to cleanup pom.xml in each module #939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haoyuan merged 6 commits into from
May 19, 2015
Merged

[TACHYON-442] Apply PluginManagement to cleanup pom.xml in each module #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b6f958
Remove unused plugin exec-maven-plugin
apc999 May 16, 2015
b76b1b8
Add maven-surefire-plugin into pluginManagement session in parent pom,
apc999 May 17, 2015
6843071
De-dup reference to surefire in profiles
apc999 May 17, 2015
146aa2b
Cleanup reference to maven-compiler-plugin using pluginManagement
apc999 May 17, 2015
8623aee
Set that by default contract tests to skip, and override this testExc…
apc999 May 17, 2015
4d50ac7
Consolidate the use of maven-jar-plugin
apc999 May 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion clients/unshaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<artifactId>tachyon-clients</artifactId>
<version>0.7.0-SNAPSHOT</version>
</parent>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-client-unshaded</artifactId>
Copy link
Contributor

@haoyuan haoyuan May 18, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why remove here?

Copy link
Contributor Author

@apc999 apc999 May 18, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The groupdId of a child pom is by default inherited from its parent pom. Before this PR, in our code some poms have defined the groupId (which is unnecessary anyway), while some other poms haven't. So in this PR, I just cleanup the poms by removing this redundant definitions to keep pom files consistent.

<packaging>jar</packaging>
<name>Tachyon Clients - Implementation</name>
Expand Down
31 changes: 0 additions & 31 deletions common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<artifactId>tachyon-parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
</parent>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-common</artifactId>
<packaging>jar</packaging>
<name>Tachyon Common</name>
Expand Down Expand Up @@ -87,35 +86,5 @@
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<executions>
<execution>
<id>default-compile</id>
<phase>compile</phase>
<configuration>
<compilerArgs>
<arg>-Xlint:none</arg>
</compilerArgs>
</configuration>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.14</version>
<configuration>
<argLine>-Djava.security.krb5.realm= -Djava.security.krb5.kdc=</argLine>
<redirectTestOutputToFile>${test.output.redirect}</redirectTestOutputToFile>
</configuration>
</plugin>
</plugins>
</build>
</project>
1 change: 0 additions & 1 deletion examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<artifactId>tachyon-parent</artifactId>
<version>0.7.0-SNAPSHOT</version>
</parent>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-examples</artifactId>
<packaging>jar</packaging>
<name>Tachyon Examples</name>
Expand Down
185 changes: 18 additions & 167 deletions integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.tachyonproject</groupId>
Expand Down Expand Up @@ -88,39 +89,6 @@
</dependencies>

<profiles>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<executions>
<execution>
<id>default-testCompile</id>
<phase>test-compile</phase>
<configuration>
<testExcludes>
<exclude>**/hadoop/contract/**</exclude>
</testExcludes>
<compilerArgs>
<arg>-Xlint:-unchecked</arg>
</compilerArgs>
</configuration>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>hdfsTest</id>
<dependencies>
Expand All @@ -133,47 +101,14 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<executions>
<execution>
<id>default-testCompile</id>
<phase>test-compile</phase>
<configuration>
<testExcludes>
<exclude>**/hadoop/contract/**</exclude>
</testExcludes>
<compilerArgs>
<arg>-Xlint:-unchecked</arg>
</compilerArgs>
</configuration>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.14</version>
<configuration>
<argLine>-Djava.security.krb5.realm= -Djava.security.krb5.kdc=</argLine>
<systemPropertyVariables>
<ufs>tachyon.underfs.hdfs.LocalMiniDFSCluster</ufs>
</systemPropertyVariables>
</configuration>
<executions>
<execution>
<id>default-test</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand All @@ -197,47 +132,14 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<executions>
<execution>
<id>default-testCompile</id>
<phase>test-compile</phase>
<configuration>
<testExcludes>
<exclude>**/hadoop/contract/**</exclude>
</testExcludes>
<compilerArgs>
<arg>-Xlint:-unchecked</arg>
</compilerArgs>
</configuration>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.14</version>
<configuration>
<argLine>-Djava.security.krb5.realm= -Djava.security.krb5.kdc=</argLine>
<systemPropertyVariables>
<ufs>tachyon.underfs.glusterfs.GlusterFSCluster</ufs>
</systemPropertyVariables>
</configuration>
<executions>
<execution>
<id>default-test</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand All @@ -255,34 +157,10 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<executions>
<execution>
<id>default-testCompile</id>
<phase>test-compile</phase>
<configuration>
<testExcludes>
<exclude>**/hadoop/contract/**</exclude>
</testExcludes>
<compilerArgs>
<arg>-Xlint:-unchecked</arg>
</compilerArgs>
</configuration>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.14</version>
<configuration>
<argLine>-Djava.security.krb5.realm= -Djava.security.krb5.kdc=</argLine>
<systemPropertyVariables>
<ufs>tachyon.underfs.s3.S3UnderStorageCluster</ufs>
<!-- Change "myAccessKey" to your access key for this test -->
Expand All @@ -294,22 +172,24 @@
<s3Bucket>s3n://my-bucket/tachyon-test</s3Bucket>
</systemPropertyVariables>
</configuration>
<executions>
<execution>
<id>default-test</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>contractTest</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes combine.self="override"/>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

Expand All @@ -318,47 +198,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<executions>
<execution>
<id>default-compile</id>
<phase>compile</phase>
<configuration>
<compilerArgs>
<arg>-Xlint:none</arg>
</compilerArgs>
</configuration>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.14</version>
<configuration>
<argLine>-Djava.security.krb5.realm= -Djava.security.krb5.kdc=</argLine>
<redirectTestOutputToFile>${test.output.redirect}</redirectTestOutputToFile>
<testExcludes>
<!--By default we skip tests in hadoop/contract, unless contractTest profile is used-->
<exclude>**/hadoop/contract/**</exclude>
</testExcludes>
</configuration>
</plugin>
<plugin>
<!-- TODO: test-jar is generated only to expose LocalTachyonCluster. We
should remove this when this class can be exposed in a better way. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
</manifest>
</archive>
<excludes>
<exclude>**/log4j.properties</exclude>
</excludes>
</configuration>
<executions>
<execution>
<goals>
Expand Down
Loading