You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by su...@apache.org on 2019/04/24 22:43:14 UTC
[incubator-pinot] branch master updated: Move pinot-filesystem into
pinot-common (#4155)
This is an automated email from the ASF dual-hosted git repository.
sunithabeeram pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 32b505c Move pinot-filesystem into pinot-common (#4155)
32b505c is described below
commit 32b505ce9d8d348238cbeef4c43b102af65e442e
Author: Sunitha Beeram <sb...@linkedin.com>
AuthorDate: Wed Apr 24 15:43:09 2019 -0700
Move pinot-filesystem into pinot-common (#4155)
---
pinot-azure-filesystem/pom.xml | 6 --
pinot-common/pom.xml | 4 --
.../org/apache/pinot/filesystem/LocalPinotFS.java | 0
.../java/org/apache/pinot/filesystem/PinotFS.java | 0
.../apache/pinot/filesystem/PinotFSFactory.java | 0
.../apache/pinot/filesystem/LocalPinotFSTest.java | 0
.../pinot/filesystem/PinotFSFactoryTest.java | 0
pinot-filesystem/pom.xml | 69 ----------------------
pinot-hadoop-filesystem/pom.xml | 6 --
pom.xml | 1 -
10 files changed, 86 deletions(-)
diff --git a/pinot-azure-filesystem/pom.xml b/pinot-azure-filesystem/pom.xml
index d18a6fa..53acd8d 100644
--- a/pinot-azure-filesystem/pom.xml
+++ b/pinot-azure-filesystem/pom.xml
@@ -50,12 +50,6 @@
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
- <artifactId>pinot-filesystem</artifactId>
- <version>0.2.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.pinot</groupId>
<artifactId>pinot-common</artifactId>
</dependency>
</dependencies>
diff --git a/pinot-common/pom.xml b/pinot-common/pom.xml
index 55485a7..0b12021 100644
--- a/pinot-common/pom.xml
+++ b/pinot-common/pom.xml
@@ -301,10 +301,6 @@
<artifactId>zookeeper</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.pinot</groupId>
- <artifactId>pinot-filesystem</artifactId>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>compile</scope>
diff --git a/pinot-filesystem/src/main/java/org/apache/pinot/filesystem/LocalPinotFS.java b/pinot-common/src/main/java/org/apache/pinot/filesystem/LocalPinotFS.java
similarity index 100%
rename from pinot-filesystem/src/main/java/org/apache/pinot/filesystem/LocalPinotFS.java
rename to pinot-common/src/main/java/org/apache/pinot/filesystem/LocalPinotFS.java
diff --git a/pinot-filesystem/src/main/java/org/apache/pinot/filesystem/PinotFS.java b/pinot-common/src/main/java/org/apache/pinot/filesystem/PinotFS.java
similarity index 100%
rename from pinot-filesystem/src/main/java/org/apache/pinot/filesystem/PinotFS.java
rename to pinot-common/src/main/java/org/apache/pinot/filesystem/PinotFS.java
diff --git a/pinot-filesystem/src/main/java/org/apache/pinot/filesystem/PinotFSFactory.java b/pinot-common/src/main/java/org/apache/pinot/filesystem/PinotFSFactory.java
similarity index 100%
rename from pinot-filesystem/src/main/java/org/apache/pinot/filesystem/PinotFSFactory.java
rename to pinot-common/src/main/java/org/apache/pinot/filesystem/PinotFSFactory.java
diff --git a/pinot-filesystem/src/test/java/org/apache/pinot/filesystem/LocalPinotFSTest.java b/pinot-common/src/test/java/org/apache/pinot/filesystem/LocalPinotFSTest.java
similarity index 100%
rename from pinot-filesystem/src/test/java/org/apache/pinot/filesystem/LocalPinotFSTest.java
rename to pinot-common/src/test/java/org/apache/pinot/filesystem/LocalPinotFSTest.java
diff --git a/pinot-filesystem/src/test/java/org/apache/pinot/filesystem/PinotFSFactoryTest.java b/pinot-common/src/test/java/org/apache/pinot/filesystem/PinotFSFactoryTest.java
similarity index 100%
rename from pinot-filesystem/src/test/java/org/apache/pinot/filesystem/PinotFSFactoryTest.java
rename to pinot-common/src/test/java/org/apache/pinot/filesystem/PinotFSFactoryTest.java
diff --git a/pinot-filesystem/pom.xml b/pinot-filesystem/pom.xml
deleted file mode 100644
index 047755a..0000000
--- a/pinot-filesystem/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<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>
- <artifactId>pinot</artifactId>
- <groupId>org.apache.pinot</groupId>
- <version>0.2.0-SNAPSHOT</version>
- </parent>
- <artifactId>pinot-filesystem</artifactId>
- <name>Pinot Filesystem</name>
- <url>https://pinot.apache.org/</url>
- <properties>
- <pinot.root>${basedir}/..</pinot.root>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/pinot-hadoop-filesystem/pom.xml b/pinot-hadoop-filesystem/pom.xml
index df4f7f5..28ce7dc 100644
--- a/pinot-hadoop-filesystem/pom.xml
+++ b/pinot-hadoop-filesystem/pom.xml
@@ -73,12 +73,6 @@
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
- <artifactId>pinot-filesystem</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.pinot</groupId>
<artifactId>pinot-common</artifactId>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 52abd08..ec083f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,6 @@
<module>pinot-integration-tests</module>
<module>pinot-distribution</module>
<module>pinot-minion</module>
- <module>pinot-filesystem</module>
<module>pinot-hadoop-filesystem</module>
<module>pinot-azure-filesystem</module>
<module>pinot-orc</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org