You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by ar...@apache.org on 2011/08/16 19:07:58 UTC
svn commit: r1158378 - in /incubator/sqoop/trunk: ./ ivy/
src/java/com/cloudera/sqoop/util/ src/test/com/cloudera/sqoop/
src/test/com/cloudera/sqoop/hbase/ src/test/com/cloudera/sqoop/mapreduce/
Author: arvind
Date: Tue Aug 16 17:07:57 2011
New Revision: 1158378
URL: http://svn.apache.org/viewvc?rev=1158378&view=rev
Log:
SQOOP-309. Update Sqoop dependency versions.
Modified:
incubator/sqoop/trunk/ivy.xml
incubator/sqoop/trunk/ivy/libraries.properties
incubator/sqoop/trunk/pom.xml
incubator/sqoop/trunk/src/java/com/cloudera/sqoop/util/AppendUtils.java
incubator/sqoop/trunk/src/test/com/cloudera/sqoop/TestAvroImport.java
incubator/sqoop/trunk/src/test/com/cloudera/sqoop/hbase/HBaseTestCase.java
incubator/sqoop/trunk/src/test/com/cloudera/sqoop/mapreduce/TestImportJob.java
Modified: incubator/sqoop/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/ivy.xml?rev=1158378&r1=1158377&r2=1158378&view=diff
==============================================================================
--- incubator/sqoop/trunk/ivy.xml (original)
+++ incubator/sqoop/trunk/ivy.xml Tue Aug 16 17:07:57 2011
@@ -68,9 +68,9 @@ under the License.
</publications>
<dependencies>
<!-- Dependencies for Cloudera's Distribution for Hadoop -->
- <dependency org="com.cloudera.hadoop" name="hadoop-core"
+ <dependency org="org.apache.hadoop" name="hadoop-core"
rev="${hadoop-core.cloudera.version}" conf="cloudera->default"/>
- <dependency org="com.cloudera.hadoop" name="hadoop-test"
+ <dependency org="org.apache.hadoop" name="hadoop-test"
rev="${hadoop-core.cloudera.version}" conf="clouderatest->default"/>
<!-- Common dependencies for Sqoop -->
Modified: incubator/sqoop/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/ivy/libraries.properties?rev=1158378&r1=1158377&r2=1158378&view=diff
==============================================================================
--- incubator/sqoop/trunk/ivy/libraries.properties (original)
+++ incubator/sqoop/trunk/ivy/libraries.properties Tue Aug 16 17:07:57 2011
@@ -29,10 +29,10 @@ commons-lang.version=2.4
commons-logging.version=1.0.4
# Cloudera Distribution dependency version
-hadoop-core.cloudera.version=0.20.2-737
+hadoop-core.cloudera.version=0.20.2-cdh3u1
-hbase.version=0.89.20100924-28
-zookeeper.version=3.3.1+7
+hbase.version=0.90.3-cdh3u1
+zookeeper.version=3.3.3-cdh3u1
hsqldb.version=1.8.0.10
Modified: incubator/sqoop/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/pom.xml?rev=1158378&r1=1158377&r2=1158378&view=diff
==============================================================================
--- incubator/sqoop/trunk/pom.xml (original)
+++ incubator/sqoop/trunk/pom.xml Tue Aug 16 17:07:57 2011
@@ -82,9 +82,9 @@ limitations under the License.
<hadoopVersion>0.20.203.0</hadoopVersion>
-->
<!-- FIXME Cloudera Distribution dependency version -->
- <hadoopVersion>0.20.2-737</hadoopVersion>
+ <hadoopVersion>0.20.2-cdh3u1</hadoopVersion>
- <hbaseVersion>0.90.3</hbaseVersion>
+ <hbaseVersion>0.90.3-cdh3u1</hbaseVersion>
</properties>
<dependencies>
@@ -107,22 +107,90 @@ limitations under the License.
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avroVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-mapred</artifactId>
<version>${avroVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>com.cloudera.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>${hadoopVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<version>${hbaseVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>thrift</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -143,7 +211,7 @@ limitations under the License.
FIXME we must depends on org.apache !
<groupId>org.apache.hadoop</groupId>
-->
- <groupId>com.cloudera.hadoop</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
<version>${hadoopVersion}</version>
<scope>test</scope>
Modified: incubator/sqoop/trunk/src/java/com/cloudera/sqoop/util/AppendUtils.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/java/com/cloudera/sqoop/util/AppendUtils.java?rev=1158378&r1=1158377&r2=1158378&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/java/com/cloudera/sqoop/util/AppendUtils.java (original)
+++ incubator/sqoop/trunk/src/java/com/cloudera/sqoop/util/AppendUtils.java Tue Aug 16 17:07:57 2011
@@ -42,7 +42,8 @@ public class AppendUtils {
private static final SimpleDateFormat DATE_FORM = new SimpleDateFormat(
"ddHHmmssSSS");
- private static final String TEMP_IMPORT_ROOT = System.getProperty( "sqoop.test.import.rootDir", "_sqoop");
+ private static final String TEMP_IMPORT_ROOT =
+ System.getProperty("sqoop.test.import.rootDir", "_sqoop");
private static final int PARTITION_DIGITS = 5;
private static final String FILEPART_SEPARATOR = "-";
Modified: incubator/sqoop/trunk/src/test/com/cloudera/sqoop/TestAvroImport.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/test/com/cloudera/sqoop/TestAvroImport.java?rev=1158378&r1=1158377&r2=1158378&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/test/com/cloudera/sqoop/TestAvroImport.java (original)
+++ incubator/sqoop/trunk/src/test/com/cloudera/sqoop/TestAvroImport.java Tue Aug 16 17:07:57 2011
@@ -93,13 +93,17 @@ public class TestAvroImport extends Impo
assertEquals("INTFIELD1", fields.get(0).name());
assertEquals(Schema.Type.UNION, fields.get(0).schema().getType());
- assertEquals(Schema.Type.INT, fields.get(0).schema().getTypes().get(0).getType());
- assertEquals(Schema.Type.NULL, fields.get(0).schema().getTypes().get(1).getType());
+ assertEquals(Schema.Type.INT,
+ fields.get(0).schema().getTypes().get(0).getType());
+ assertEquals(Schema.Type.NULL,
+ fields.get(0).schema().getTypes().get(1).getType());
assertEquals("INTFIELD2", fields.get(1).name());
assertEquals(Schema.Type.UNION, fields.get(1).schema().getType());
- assertEquals(Schema.Type.INT, fields.get(1).schema().getTypes().get(0).getType());
- assertEquals(Schema.Type.NULL, fields.get(1).schema().getTypes().get(1).getType());
+ assertEquals(Schema.Type.INT,
+ fields.get(1).schema().getTypes().get(0).getType());
+ assertEquals(Schema.Type.NULL,
+ fields.get(1).schema().getTypes().get(1).getType());
GenericRecord record1 = reader.next();
assertEquals(1, record1.get("INTFIELD1"));
Modified: incubator/sqoop/trunk/src/test/com/cloudera/sqoop/hbase/HBaseTestCase.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/test/com/cloudera/sqoop/hbase/HBaseTestCase.java?rev=1158378&r1=1158377&r2=1158378&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/test/com/cloudera/sqoop/hbase/HBaseTestCase.java (original)
+++ incubator/sqoop/trunk/src/test/com/cloudera/sqoop/hbase/HBaseTestCase.java Tue Aug 16 17:07:57 2011
@@ -47,6 +47,21 @@ import com.cloudera.sqoop.testutil.Impor
*/
public abstract class HBaseTestCase extends ImportJobTestCase {
+ /*
+ * This is to restore test.build.data system property which gets reset
+ * when HBase tests are run. Since other tests in Sqoop also depend upon
+ * this property, they can fail if are run subsequently in the same VM.
+ */
+ private static String testBuildDataProperty = "";
+
+ private static void recordTestBuildDataProperty() {
+ testBuildDataProperty = System.getProperty("test.build.data", "");
+ }
+
+ private static void restoreTestBuidlDataProperty() {
+ System.setProperty("test.build.data", testBuildDataProperty);
+ }
+
public static final Log LOG = LogFactory.getLog(
HBaseTestCase.class.getName());
@@ -105,6 +120,7 @@ public abstract class HBaseTestCase exte
@Override
@Before
public void setUp() {
+ HBaseTestCase.recordTestBuildDataProperty();
try {
startMaster();
} catch (Exception e) {
@@ -133,7 +149,7 @@ public abstract class HBaseTestCase exte
LOG.warn("Error shutting down HBase minicluster: "
+ StringUtils.stringifyException(e));
}
-
+ HBaseTestCase.restoreTestBuidlDataProperty();
super.tearDown();
}
Modified: incubator/sqoop/trunk/src/test/com/cloudera/sqoop/mapreduce/TestImportJob.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/trunk/src/test/com/cloudera/sqoop/mapreduce/TestImportJob.java?rev=1158378&r1=1158377&r2=1158378&view=diff
==============================================================================
--- incubator/sqoop/trunk/src/test/com/cloudera/sqoop/mapreduce/TestImportJob.java (original)
+++ incubator/sqoop/trunk/src/test/com/cloudera/sqoop/mapreduce/TestImportJob.java Tue Aug 16 17:07:57 2011
@@ -58,7 +58,8 @@ public class TestImportJob extends Impor
Configuration conf = new Configuration();
- LogFactory.getLog( getClass() ).info( " getWarehouseDir() " + getWarehouseDir() );
+ LogFactory.getLog(getClass()).info(
+ " getWarehouseDir() " + getWarehouseDir());
// Make the output dir exist so we know the job will fail via IOException.
Path outputPath = new Path(new Path(getWarehouseDir()), getTableName());