Skip to content

Commit

Permalink
Merge pull request #2 from TachyonNexus/pom
Browse files Browse the repository at this point in the history 
[RENAME] updating POM artifacts
  • Loading branch information
@apc999
apc999 committed Feb 4, 2016
2 parents b700608 + 51b7010 commit b419e15
Show file tree
Hide file tree
Showing 32 changed files with 351 additions and 351 deletions.
70 changes: 35 additions & 35 deletions assembly/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<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>
<artifactId>tachyon-parent</artifactId>
<version>0.9.0-RC3</version>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>tachyon-assemblies</artifactId>
<name>Tachyon Assemblies</name>
<description>Assemblies of Tachyon system</description>
<artifactId>alluxio-assemblies</artifactId>
<name>Alluxio Assemblies</name>
<description>Assemblies of Alluxio system</description>

<properties>
<!-- These need to be defined here as well as in the parent pom so that mvn can run
Expand All @@ -20,53 +20,53 @@

<dependencies>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-core-server</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-core-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-keyvalue-server</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-keyvalue-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-underfs-hdfs</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-underfs-hdfs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-underfs-glusterfs</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-underfs-glusterfs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-underfs-oss</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-underfs-oss</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-underfs-s3</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-underfs-s3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-underfs-swift</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-underfs-swift</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-underfs-local</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-underfs-local</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-examples</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-examples</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-shell</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-shell</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand All @@ -76,8 +76,8 @@
<id>mesos</id>
<dependencies>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-integration-mesos</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-integration-mesos</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand All @@ -87,8 +87,8 @@
<id>yarn</id>
<dependencies>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-integration-yarn</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-integration-yarn</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand All @@ -98,13 +98,13 @@
<id>developer</id>
<dependencies>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-integration-mesos</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-integration-mesos</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-integration-yarn</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-integration-yarn</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand Down Expand Up @@ -157,7 +157,7 @@
<attach>false</attach>
<finalName>alluxio-${project.version}</finalName>
<descriptors>
<descriptor>src/main/assembly/tachyon-dist.xml</descriptor>
<descriptor>src/main/assembly/alluxio-dist.xml</descriptor>
</descriptors>
</configuration>
</plugin>
Expand Down
0 assembly/src/main/assembly/tachyon-dist.xml → assembly/src/main/assembly/alluxio-dist.xml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion bin/alluxio-fuse.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ get_env () {
. $TACHYON_LIBEXEC_DIR/alluxio-config.sh

TACHYON_MASTER_PORT=${TACHYON_MASTER_PORT:-19998}
TACHYON_FUSE_JAR=${BIN}/../integration/fuse/target/tachyon-integration-fuse-${VERSION}-jar-with-dependencies.jar
TACHYON_FUSE_JAR=${BIN}/../integration/fuse/target/alluxio-integration-fuse-${VERSION}-jar-with-dependencies.jar
FUSE_MAX_WRITE=131072
}

Expand Down
0 build/checkstyle/tachyon_checks.xml → build/checkstyle/alluxio_checks.xml
View file
File renamed without changes.
16 changes: 8 additions & 8 deletions core/client-internal/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<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>
<artifactId>tachyon-core</artifactId>
<version>0.9.0-RC3</version>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>tachyon-core-client-internal</artifactId>
<artifactId>alluxio-core-client-internal</artifactId>
<packaging>jar</packaging>
<name>Tachyon Core - Client Implementation</name>
<description>Client implementation of Tachyon core</description>
<name>Alluxio Core - Client Implementation</name>
<description>Client implementation of Alluxio core</description>

<properties>
<!-- These need to be defined here as well as in the parent pom so that mvn can run
Expand Down Expand Up @@ -38,8 +38,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-core-common</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-core-common</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
60 changes: 30 additions & 30 deletions core/client/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<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>
<artifactId>tachyon-core</artifactId>
<version>0.9.0-RC3</version>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-client</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-client</artifactId>
<packaging>jar</packaging>
<name>Tachyon Core - Client Distribution</name>
<description>Distribution of client for Tachyon core</description>
<name>Alluxio Core - Client Distribution</name>
<description>Distribution of client for Alluxio core</description>

<properties>
<!-- These need to be defined here as well as in the parent pom so that mvn can run
Expand Down Expand Up @@ -77,63 +77,63 @@
<artifactId>hadoop-client</artifactId>
</dependency>

<!-- Other Tachyon dependencies -->
<!-- Other Alluxio dependencies -->
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-core-client-internal</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-core-client-internal</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-core-common</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-core-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-underfs-hdfs</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-underfs-hdfs</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-core-common</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-core-common</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- module alluxio-underfs-glusterfs depends on
hadoop library of 2.3.0, which may have problem when using with
hadoop 2.4 and later. Please check instructions in
http://tachyon-project.org/documentation/Configuring-Tachyon-with-GlusterFS.html
for how to use glusterfs with Tachyon. -->
http://alluxio.org/documentation/Configuring-Alluxio-with-GlusterFS.html
for how to use glusterfs with Alluxio. -->
<!-- <dependency> -->
<!-- <groupId>org.tachyonproject</groupId> -->
<!-- <groupId>org.alluxio.alluxio</groupId> -->
<!-- <artifactId>alluxio-underfs-glusterfs</artifactId> -->
<!-- <version>${project.version}</version> -->
<!-- <exclusions> -->
<!-- <exclusion> -->
<!-- <groupId>org.tachyonproject</groupId> -->
<!-- <groupId>org.alluxio.alluxio</groupId> -->
<!-- <artifactId>alluxio-core-common</artifactId> -->
<!-- </exclusion> -->
<!-- </exclusions> -->
<!-- </dependency> -->
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-underfs-s3</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-underfs-s3</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-core-common</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-core-common</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-underfs-local</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-underfs-local</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-core-common</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-core-common</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down Expand Up @@ -174,8 +174,8 @@
<configuration>
<artifactSet>
<includes>
<include>org.tachyonproject:tachyon-core-common</include>
<include>org.tachyonproject:tachyon-core-client-internal</include>
<include>org.alluxio.alluxio:alluxio-core-common</include>
<include>org.alluxio.alluxio:alluxio-core-client-internal</include>
<include>org.apache.thrift:libthrift</include>
</includes>
</artifactSet>
Expand Down
12 changes: 6 additions & 6 deletions core/common/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<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>
<artifactId>tachyon-core</artifactId>
<version>0.9.0-RC3</version>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>tachyon-core-common</artifactId>
<artifactId>alluxio-core-common</artifactId>
<packaging>jar</packaging>
<name>Tachyon Core - Common Utilities</name>
<description>Common utilities shared in Tachyon core modules</description>
<name>Alluxio Core - Common Utilities</name>
<description>Common utilities shared in Alluxio core modules</description>

<properties>
<!-- These need to be defined here as well as in the parent pom so that mvn can run
Expand Down
12 changes: 6 additions & 6 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<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>
<artifactId>tachyon-parent</artifactId>
<version>0.9.0-RC3</version>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>tachyon-core</artifactId>
<artifactId>alluxio-core</artifactId>
<packaging>pom</packaging>
<name>Tachyon Core</name>
<description>Parent POM for Tachyon core</description>
<name>Alluxio Core</name>
<description>Parent POM for Alluxio core</description>

<modules>
<module>common</module>
Expand Down
24 changes: 12 additions & 12 deletions core/server/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<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>
<artifactId>tachyon-core</artifactId>
<version>0.9.0-RC3</version>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>tachyon-core-server</artifactId>
<artifactId>alluxio-core-server</artifactId>
<packaging>jar</packaging>
<name>Tachyon Core - Server Implementation</name>
<description>Server implementation of Tachyon core</description>
<name>Alluxio Core - Server Implementation</name>
<description>Server implementation of Alluxio core</description>

<properties>
<!-- These need to be defined here as well as in the parent pom so that mvn can run
Expand All @@ -20,13 +20,13 @@

<dependencies>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-core-client-internal</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-core-client-internal</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-core-common</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-core-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -109,8 +109,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.tachyonproject</groupId>
<artifactId>tachyon-underfs-local</artifactId>
<groupId>org.alluxio.alluxio</groupId>
<artifactId>alluxio-underfs-local</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
Loading

0 comments on commit b419e15

Please sign in to comment.