Skip to content

Adjusting HBase Support #1218

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

Closed
ghost wants to merge 3 commits into from
Closed

Adjusting HBase Support #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e71159
adjusting hbase support
Dec 14, 2015
11a8cb2
fix hbase 0.98 version
Dec 14, 2015
c208ea4
more changes that depend on hbase/hadoop changes
Dec 14, 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
5 changes: 1 addition & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,12 @@
<sesame.version>2.7.10</sesame.version>
<slf4j.version>1.7.5</slf4j.version>
<httpcomponents.version>4.4.1</httpcomponents.version>
<hadoop1.version>1.2.1</hadoop1.version>
<hadoop2.version>2.7.1</hadoop2.version>
<hbase094.version>0.94.25</hbase094.version>
<hbase096.core.version>0.96.2</hbase096.core.version>
<hbase096.version>${hbase096.core.version}-hadoop2</hbase096.version>
<hbase098.core.version>0.98.2</hbase098.core.version>
<hbase098.version>${hbase098.core.version}-hadoop2</hbase098.version>
<hbase100.core.version>1.0.2</hbase100.core.version>
<hbase100.version>${hbase100.core.version}</hbase100.version>
<hbase111.version>1.1.1</hbase111.version>
<jackson1.version>1.9.2</jackson1.version>
<jackson2.version>2.3.0</jackson2.version>
<!-- ES depends on Lucene. This ES dependency can affect the
Expand Down
11 changes: 8 additions & 3 deletions titan-all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<version>${hbase098.core.version}-hadoop1</version>
<version>${hbase111.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand All @@ -55,8 +55,13 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>${hadoop1.version}</version>
<artifactId>hadoop-common</artifactId>
<version>${hadoop2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
<version>${hadoop2.version}</version>
</dependency>
<dependency>
<groupId>com.thinkaurelius.titan</groupId>
Expand Down
5 changes: 2 additions & 3 deletions titan-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,10 @@
</properties>

<modules>
<module>titan-dist-hadoop-1</module>
<!-- Hadoop 2 is blocked on TP3 support -->
<!-- <module>titan-dist-hadoop-2</module> -->
<module>titan-dist-hadoop-2</module>
</modules>


<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
214 changes: 0 additions & 214 deletions titan-dist/titan-dist-hadoop-1/pom.xml
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions titan-dist/titan-dist-hadoop-1/src/assembly/descriptor/archive.xml
View file
Open in desktop

This file was deleted.

14 changes: 10 additions & 4 deletions titan-dist/titan-dist-hadoop-2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.thinkaurelius.titan</groupId>
<artifactId>titan-dist</artifactId>
<version>0.9.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
Expand All @@ -24,13 +24,19 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<version>${hbase098.version}</version>
<version>${hbase111.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
<version>${hbase111.version}</version>
<!-- Need the -server artifact for hbase.mapreduce.TableInputFormat (Faunus) -->
<version>${hbase098.version}</version>
<exclusions>
<exclusion>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

Expand Down Expand Up @@ -151,7 +157,7 @@
<argument>-classpath</argument>
<classpath />
<argument>com.thinkaurelius.titan.example.GraphOfTheGodsFactory</argument>
<argument>${project.build.directory}/conf/titan-berkeleydb-es.properties</argument>
<argument>${project.build.directory}/conf/titan-berkeleyje-es.properties</argument>
</arguments>
</configuration>
</execution>
Expand Down
1 change: 0 additions & 1 deletion titan-hadoop-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

<modules>
<module>titan-hadoop-core</module>
<module>titan-hadoop-1</module>
<module>titan-hadoop-2</module>
<module>titan-hadoop</module>
</modules>
Expand Down
Loading