Skip to content

Commit

Permalink
Move shaded module from a top module to a submodule inside underfs
Browse files Browse the repository at this point in the history
and rename the module to be consistent with other modules

pr-link: #8954
change-id: cid-1975a4cd7da03953ebd6900cde25b5af36719364
  • Loading branch information
apc999 authored and alluxio-bot committed May 3, 2019
1 parent 33f5329 commit 0fbb7d6
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -173,14 +173,14 @@

<modules>
<module>alluxio-ui</module>
<module>alluxio-shaded-hadoop</module>
<module>assembly</module>
<module>core</module>
<module>examples</module>
<module>integration</module>
<module>logserver</module>
<module>minicluster</module>
<module>job</module>
<module>shaded</module>
<module>shell</module>
<module>tests</module>
<module>underfs</module>
Expand Down
8 changes: 4 additions & 4 deletions alluxio-shaded-hadoop/pom.xml → shaded/hadoop/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.alluxio</groupId>
<artifactId>alluxio-parent</artifactId>
<artifactId>alluxio-shaded</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>alluxio-shaded-hadoop</artifactId>
<packaging>jar</packaging>
<name>Alluxio Shaded HDFS</name>
<name>Alluxio Shaded Libraries - Hadoop</name>
<version>${ufs.hadoop.version}</version>
<description>Alluxio shaded hadoop</description>
<description>Shaded Hadoop Module</description>

<properties>
<!-- The build path need to be defined here as well as in the parent pom so that mvn can -->
<!-- run properly from sub-project directories -->
<build.path>${project.parent.basedir}/build</build.path>
<build.path>${project.parent.parent.basedir}/build</build.path>
<ufs.hadoop.version>2.2.0</ufs.hadoop.version>
<shading.prefix>alluxio.shaded.hdfs</shading.prefix>
<!-- Composite jar name with both hadoop version and project version included -->
Expand Down
34 changes: 34 additions & 0 deletions shaded/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!--
The Alluxio Open Foundation licenses this work under the Apache License, version 2.0
(the "License"). You may not use this work except in compliance with the License, which is
available at www.apache.org/licenses/LICENSE-2.0
This software is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
either express or implied, as more fully set forth in the License.
See the NOTICE file distributed with this work for information regarding copyright ownership.
-->
<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.alluxio</groupId>
<artifactId>alluxio-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>alluxio-shaded</artifactId>
<packaging>pom</packaging>
<name>Alluxio Shaded Libraries</name>
<description>Parent POM for different shaded Libraries</description>

<modules>
<module>hadoop</module>
</modules>

<properties>
<!-- These need to be defined here as well as in the parent pom so that mvn can run
properly from sub-project directories -->
<build.path>${project.parent.basedir}/build</build.path>
</properties>
</project>

0 comments on commit 0fbb7d6

Please sign in to comment.