You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gora.apache.org by io...@apache.org on 2011/10/22 20:56:38 UTC
svn commit: r1187751 - in /incubator/gora/trunk: gora-cassandra/pom.xml
gora-hbase/pom.xml gora-hbase/src/test/conf/hbase-site.xml gora-sql/pom.xml
gora-tutorial/pom.xml pom.xml
Author: iocanel
Date: Sat Oct 22 18:56:37 2011
New Revision: 1187751
URL: http://svn.apache.org/viewvc?rev=1187751&view=rev
Log:
Cleanup in maven poms. Fixed cassandra build in maven. Fixed hbase tests under maven.
Modified:
incubator/gora/trunk/gora-cassandra/pom.xml
incubator/gora/trunk/gora-hbase/pom.xml
incubator/gora/trunk/gora-hbase/src/test/conf/hbase-site.xml
incubator/gora/trunk/gora-sql/pom.xml
incubator/gora/trunk/gora-tutorial/pom.xml
incubator/gora/trunk/pom.xml
Modified: incubator/gora/trunk/gora-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/incubator/gora/trunk/gora-cassandra/pom.xml?rev=1187751&r1=1187750&r2=1187751&view=diff
==============================================================================
--- incubator/gora/trunk/gora-cassandra/pom.xml (original)
+++ incubator/gora/trunk/gora-cassandra/pom.xml Sat Oct 22 18:56:37 2011
@@ -59,13 +59,11 @@
<dependency>
<groupId>org.apache.gora</groupId>
<artifactId>gora-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.gora</groupId>
<artifactId>gora-core</artifactId>
- <version>${project.version}</version>
<classifier>tests</classifier>
</dependency>
@@ -80,6 +78,11 @@
<artifactId>cassandra-thrift</artifactId>
</dependency>
+ <dependency>
+ <groupId>me.prettyprint</groupId>
+ <artifactId>hector-core</artifactId>
+ </dependency>
+
<!-- Misc Dependencies -->
<dependency>
Modified: incubator/gora/trunk/gora-hbase/pom.xml
URL: http://svn.apache.org/viewvc/incubator/gora/trunk/gora-hbase/pom.xml?rev=1187751&r1=1187750&r2=1187751&view=diff
==============================================================================
--- incubator/gora/trunk/gora-hbase/pom.xml (original)
+++ incubator/gora/trunk/gora-hbase/pom.xml Sat Oct 22 18:56:37 2011
@@ -30,6 +30,14 @@
<build>
<sourceDirectory>src/main/java</sourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>${project.basedir}/src/test/conf</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -57,14 +65,12 @@
<dependency>
<groupId>org.apache.gora</groupId>
<artifactId>gora-core</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.gora</groupId>
<artifactId>gora-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
+ <classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -72,13 +78,11 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
- <version>0.90.0</version>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
- <version>0.90.0</version>
<classifier>tests</classifier>
</dependency>
Modified: incubator/gora/trunk/gora-hbase/src/test/conf/hbase-site.xml
URL: http://svn.apache.org/viewvc/incubator/gora/trunk/gora-hbase/src/test/conf/hbase-site.xml?rev=1187751&r1=1187750&r2=1187751&view=diff
==============================================================================
--- incubator/gora/trunk/gora-hbase/src/test/conf/hbase-site.xml (original)
+++ incubator/gora/trunk/gora-hbase/src/test/conf/hbase-site.xml Sat Oct 22 18:56:37 2011
@@ -129,7 +129,7 @@
</property>
<property>
<name>hbase.zookeeper.property.clientPort</name>
- <value>21810</value>
+ <value>21818</value>
<description>Property from ZooKeeper's config zoo.cfg.
The port at which the clients will connect.
</description>
Modified: incubator/gora/trunk/gora-sql/pom.xml
URL: http://svn.apache.org/viewvc/incubator/gora/trunk/gora-sql/pom.xml?rev=1187751&r1=1187750&r2=1187751&view=diff
==============================================================================
--- incubator/gora/trunk/gora-sql/pom.xml (original)
+++ incubator/gora/trunk/gora-sql/pom.xml Sat Oct 22 18:56:37 2011
@@ -57,7 +57,12 @@
<dependency>
<groupId>org.apache.gora</groupId>
<artifactId>gora-core</artifactId>
- <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora-core</artifactId>
+ <classifier>tests</classifier>
</dependency>
<dependency>
@@ -89,12 +94,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <exclusions>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Testing Dependencies -->
Modified: incubator/gora/trunk/gora-tutorial/pom.xml
URL: http://svn.apache.org/viewvc/incubator/gora/trunk/gora-tutorial/pom.xml?rev=1187751&r1=1187750&r2=1187751&view=diff
==============================================================================
--- incubator/gora/trunk/gora-tutorial/pom.xml (original)
+++ incubator/gora/trunk/gora-tutorial/pom.xml Sat Oct 22 18:56:37 2011
@@ -57,13 +57,11 @@
<dependency>
<groupId>org.apache.gora</groupId>
<artifactId>gora-hbase</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.gora</groupId>
<artifactId>gora-sql</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
Modified: incubator/gora/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/gora/trunk/pom.xml?rev=1187751&r1=1187750&r2=1187751&view=diff
==============================================================================
--- incubator/gora/trunk/pom.xml (original)
+++ incubator/gora/trunk/pom.xml Sat Oct 22 18:56:37 2011
@@ -105,7 +105,7 @@
<modules>
<module>gora-core</module>
<module>gora-hbase</module>
- <!--<module>gora-cassandra</module>-->
+ <module>gora-cassandra</module>
<module>gora-sql</module>
<module>gora-tutorial</module>
</modules>
@@ -117,10 +117,12 @@
<hbase.version>0.90.0</hbase.version>
<avro.version>1.3.2</avro.version>
<!-- Cassandra Dependencies -->
- <cassandra.version>0.7.3</cassandra.version>
+ <cassandra.version>0.8.1</cassandra.version>
+ <cassandra.thrift.version>0.8.1</cassandra.thrift.version>
<libthrift.version>0.5.0</libthrift.version>
+ <hector.version>0.8.0-1</hector.version>
<!-- Misc Dependencies -->
- <guava.version>r06</guava.version>
+ <guava.version>r09</guava.version>
<commons-lang.version>2.5</commons-lang.version>
<jdom.version>1.1</jdom.version>
<sqlbuilder.version>2.0.6</sqlbuilder.version>
@@ -146,6 +148,48 @@
<dependencyManagement>
<dependencies>
+ <!-- Internal Dependencies -->
+ <dependency>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora-cassandra</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora-sql</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora-hbase</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora-hbase</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.gora</groupId>
+ <artifactId>gora-tutorial</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- Hadoop Dependencies -->
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -168,10 +212,6 @@
<groupId>org.eclipse.jdt</groupId>
<artifactId>core</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-*</artifactId>
- </exclusion>
</exclusions>
</dependency>
@@ -203,16 +243,22 @@
<!-- Cassandra Dependencies -->
<dependency>
<groupId>org.apache.cassandra</groupId>
- <artifactId>cassandra</artifactId>
+ <artifactId>cassandra-all</artifactId>
<version>${cassandra.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.cassandra.deps</groupId>
- <artifactId>libthrift</artifactId>
- <version>${libthrift.version}</version>
+ <groupId>org.apache.cassandra</groupId>
+ <artifactId>cassandra-thrift</artifactId>
+ <version>${cassandra.thrift.version}</version>
</dependency>
+ <dependency>
+ <groupId>me.prettyprint</groupId>
+ <artifactId>hector-core</artifactId>
+ <version>${hector.version}</version>
+ </dependency>
+
<!-- Misc Dependencies -->
<dependency>
<groupId>com.google.guava</groupId>
@@ -282,6 +328,14 @@
<groupId>com.sun.jmx</groupId>
<artifactId>jmxri</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
</exclusions>
</dependency>