Skip to content
Permalink
Browse files
GIRAPH-1240
closes #127
  • Loading branch information
dlogothetis committed May 8, 2020
1 parent 2cae34a commit baa887fccbe989aaad6872eb1d1468088ec483d0
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 142 deletions.
@@ -95,14 +95,6 @@
</dependency>
<dependency>
<groupId>org.apache.giraph</groupId>
<<<<<<< HEAD
<artifactId>giraph-accumulo</artifactId>
=======
<artifactId>giraph-hcatalog</artifactId>
>>>>>>> 8bf0c60fad64676bc6181dac7320df8d3bbedcbf
</dependency>
<dependency>
<groupId>org.apache.giraph</groupId>
<artifactId>giraph-examples</artifactId>
</dependency>
</dependencies>
134 pom.xml
@@ -331,11 +331,6 @@ under the License.
<dep.fastutil.version>6.5.4</dep.fastutil.version>
<dep.google.findbugs.version>2.0.2</dep.google.findbugs.version>
<dep.guava.version>21.0</dep.guava.version>
<<<<<<< HEAD
<dep.hbase.version>0.94.16</dep.hbase.version>
=======
<dep.hcatalog.version>0.5.0-incubating</dep.hcatalog.version>
>>>>>>> 0155f6eb23f5c1765a00aa6181bb80daffbb51e6
<dep.hive.version>0.11.0</dep.hive.version>
<dep.hiveio.version>0.26</dep.hiveio.version>
<dep.jaxb-impl.version>2.2.4-1</dep.jaxb-impl.version>
@@ -774,13 +769,6 @@ under the License.
<exclude>**/*.json</exclude>
<!-- test resources (for Giraph on YARN profile) -->
<exclude>**/test/resources/**</exclude>
<!-- Gora configs -->
<<<<<<< HEAD
<!-- Rexster resource -->
<exclude>giraph-rexster/giraph-kibble/src/main/resources/META-INF/services/com.tinkerpop.rexster.extension.RexsterExtension</exclude>
=======
<exclude>giraph-gora/conf/**</exclude>
>>>>>>> e1f5a1f0e7c1ec25ade7efe03e25c7d86db1d5fe
<!-- site images -->
<exclude>src/site/resources/images/*.svg</exclude>
<exclude>giraph-debugger/src/main/resources/org/apache/giraph/debugger/mock/*.vm</exclude>
@@ -986,16 +974,6 @@ under the License.
<profile>
<id>hadoop_1</id>
<modules>
<<<<<<< HEAD
<module>giraph-accumulo</module>
<<<<<<< HEAD
=======
<module>giraph-hcatalog</module>
>>>>>>> 8bf0c60fad64676bc6181dac7320df8d3bbedcbf
<module>giraph-gora</module>
=======
<module>giraph-hcatalog</module>
>>>>>>> 5b36c5671da26f5fba3890e868048ef59a3e4903
<module>giraph-dist</module>
</modules>
<activation>
@@ -1144,20 +1122,6 @@ under the License.
<profile>
<id>hadoop_2</id>
<modules>
<<<<<<< HEAD
<module>giraph-accumulo</module>
<<<<<<< HEAD
=======
>>>>>>> 8bf0c60fad64676bc6181dac7320df8d3bbedcbf
<module>giraph-hbase</module>
<<<<<<< HEAD
=======
<module>giraph-hcatalog</module>
>>>>>>> 0155f6eb23f5c1765a00aa6181bb80daffbb51e6
<module>giraph-gora</module>
=======
<module>giraph-hcatalog</module>
>>>>>>> 5b36c5671da26f5fba3890e868048ef59a3e4903
<module>giraph-dist</module>
</modules>
<properties>
@@ -1509,104 +1473,6 @@ under the License.
<artifactId>giraph-examples</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.giraph</groupId>
<<<<<<< HEAD
<artifactId>giraph-hbase</artifactId>
<version>${project.version}</version>
=======
<artifactId>giraph-hcatalog</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
</exclusion>
</exclusions>
>>>>>>> 0155f6eb23f5c1765a00aa6181bb80daffbb51e6
</dependency>
<dependency>
<groupId>org.apache.giraph</groupId>
<<<<<<< HEAD
<artifactId>giraph-accumulo</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.giraph</groupId>
<<<<<<< HEAD
=======
>>>>>>> 8bf0c60fad64676bc6181dac7320df8d3bbedcbf
<artifactId>giraph-rexster-io</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.giraph</groupId>
<artifactId>giraph-kibble</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<<<<<<< HEAD
<groupId>org.apache.giraph</groupId>
=======
>>>>>>> e1f5a1f0e7c1ec25ade7efe03e25c7d86db1d5fe
<artifactId>giraph-gora</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.gora</groupId>
<artifactId>gora-core</artifactId>
<version>${dep.gora.version}</version>
<exclusions>
<exclusion>
=======
<groupId>org.apache.hcatalog</groupId>
<artifactId>hcatalog-core</artifactId>
<version>${dep.hcatalog.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.pig</groupId>
<artifactId>pig</artifactId>
</exclusion>
<exclusion>
>>>>>>> 5b36c5671da26f5fba3890e868048ef59a3e4903
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<<<<<<< HEAD
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
=======
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
</exclusion>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hive</groupId>
<artifactId>hive-common</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
>>>>>>> 5b36c5671da26f5fba3890e868048ef59a3e4903
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId>

0 comments on commit baa887f

Please sign in to comment.