Skip to content
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

Jump to bottom

titan 0.4.2 hadoop 2.2 support #609

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

titan 0.4.2 hadoop 2.2 support #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
48cfc19
Splitting HBase into modules for 0.94 and 0.96
dalaro Feb 7, 2014
c693132
revert the version
Mar 12, 2014
81fb590
Backport hbase-delete change from f0d41c
Mar 12, 2014
956db53
Mark hadoop-core optional for HBase 0.94.x
dalaro Feb 8, 2014
c568994
Testing HBase 0.96 hadoop1/2 support
dalaro Feb 11, 2014
10a3e62
Disable HBase version defaults check in testing
dalaro Feb 11, 2014
cb4c90d
Add Netty dependency to HBase 0.96-hadoop1
dalaro Feb 12, 2014
2573ac1
Update HBase shell scripts for 0.96
dalaro Feb 12, 2014
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
21 changes: 21 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
<jersey.version>1.17</jersey.version>
<jna.version>3.2.7</jna.version>
<kuali.s3.wagon.version>1.1.20</kuali.s3.wagon.version>
<jasper.version>5.5.23</jasper.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<titan.testdir>${project.build.directory}/titan-test</titan.testdir>
Expand Down Expand Up @@ -276,6 +277,11 @@
<artifactId>wagon-maven-plugin</artifactId>
<version>1.0-beta-4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
Expand Down Expand Up @@ -434,6 +440,16 @@
<artifactId>jettison</artifactId>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
<version>${jasper.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
<version>${jasper.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
Expand Down Expand Up @@ -553,6 +569,11 @@
<artifactId>netty</artifactId>
<version>3.2.7.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>3.6.6.Final</version>
</dependency>
<!-- Package prefix is org.apache.commons.httpclient -->
<dependency>
<groupId>commons-httpclient</groupId>
Expand Down
6 changes: 6 additions & 0 deletions titan-hbase/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/titan-hbase-*/.settings/
/titan-hbase-*/.project
/titan-hbase-*/.classpath
/titan-hbase-*/bin/
/titan-hbase-*/conf/
/titan-hbase-*/logs/
1 change: 0 additions & 1 deletion titan-hbase/conf/.gitignore
View file
Open in desktop

This file was deleted.

226 changes: 104 additions & 122 deletions titan-hbase/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,21 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>titan-hbase</artifactId>
<packaging>pom</packaging>
<name>Titan-HBase: Distributed Graph Database</name>
<url>http://thinkaurelius.github.com/titan/</url>

<modules>
<module>titan-hbase-094</module>
<module>titan-hbase-096</module>
</modules>

<properties>
<hbase.version>0.94.12</hbase.version>
<hadoop.version>1.0.4</hadoop.version>
<hadoop.artifact>hadoop-core</hadoop.artifact>
<titan.hbase.mvn.opts />
<titan.hbase.mvn.opts>-Dhadoop.version=${hadoop.version} -Dhadoop.profile=${hadoop.profile}</titan.hbase.mvn.opts>
<default.test.jvm.opts>-Xms256m -Xmx1280m -XX:+HeapDumpOnOutOfMemoryError -ea ${test.extra.jvm.opts}</default.test.jvm.opts>
<mem.jvm.opts>-Xms256m -Xmx768m -ea -XX:+HeapDumpOnOutOfMemoryError ${test.extra.jvm.opts}</mem.jvm.opts>
<top.level.basedir>${basedir}/..</top.level.basedir>
</properties>

<dependencies>
<dependency>
<groupId>com.thinkaurelius.titan</groupId>
Expand All @@ -36,53 +40,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<!-- Update the hadoop-core artifact version when you update this -->
<version>${hbase.version}</version>
<exclusions>
<exclusion>
<artifactId>avro</artifactId>
<groupId>org.apache.avro</groupId>
</exclusion>
<exclusion>
<artifactId>jruby-complete</artifactId>
<groupId>org.jruby</groupId>
</exclusion>
<exclusion>
<artifactId>asm</artifactId>
<groupId>asm</groupId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<artifactId>jruby-complete</artifactId>
<groupId>org.jruby</groupId>
<version>1.6.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>${hadoop.artifact}</artifactId>
<version>${hadoop.version}</version>
</dependency>
<!-- Logging.

Based on these two HBase links, it seems that HBase has
Expand Down Expand Up @@ -113,76 +70,101 @@
<scope>compile</scope>
</dependency>
</dependencies>

<build>
<testResources>
<testResource>
<directory>${project.basedir}/src/test/resources</directory>
<filtering>true</filtering>
</testResource>
</testResources>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>filter-hbase-site-xml</id>
<phase>process-test-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.basedir}/conf</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/test/conf/</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>filter-hbase-conf</id>
<phase>process-test-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.basedir}/conf</outputDirectory>
<delimiters>
<delimiter>$MAVEN{*}</delimiter>
</delimiters>
<resources>
<resource>
<directory>${project.basedir}/../src/test/conf/</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<!-- Using assembly instead of resources because resources breaks filemodes and
permissions: http://jira.codehaus.org/browse/MRESOURCES-132 -->
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>copy-hbase-bin</id>
<phase>process-test-resources</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<finalName>/</finalName>
<attach>false</attach>
<outputDirectory>${project.basedir}/bin</outputDirectory>
<descriptors>
<descriptor>${project.basedir}/../src/test/binassembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>include-common-hbase-sources</id>
<phase>process-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>../src/main/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-clean-plugin</artifactId>
<executions>
<execution>
<id>clean-hbase-files</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
<configuration>
<excludeDefaultDirectories>true</excludeDefaultDirectories>
<filesets>
<fileset>
<directory>bin/</directory>
</fileset>
<fileset>
<directory>conf/</directory>
</fileset>
</filesets>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>

<profiles>
<profile>
<id>hadoop2</id>

<activation>
<!--
We use the same activation criterion as HBase so that
there's one less command-line option to remember.
-->
<property>
<name>hadoop.profile</name>
<value>2.0</value>
</property>
</activation>

<properties>
<hadoop.version>2.2.0</hadoop.version>
<hadoop.artifact>hadoop-common</hadoop.artifact>
<titan.hbase.mvn.opts>-Dhadoop.version=${hadoop.version} -Dhadoop.profile=2.0</titan.hbase.mvn.opts>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
Loading