ACCESS-211: Add maven profile for compiling access with upstream Apache hadoop/hive. additional build/test patches
diff --git a/access-tests/pom.xml b/access-tests/pom.xml
index 158d0b9..018328c 100644
--- a/access-tests/pom.xml
+++ b/access-tests/pom.xml
@@ -201,21 +201,7 @@
</dependency>
</dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>${maven.compile.source}</source>
- <target>${maven.compile.target}</target>
- <excludes>
- <exclude>**/AbstractTestWithStaticDFS*</exclude>
- <exclude>${test-dfs.exclude}</exclude>
- <exclude>${static-dfs.exclude}</exclude>
- </excludes>
- </configuration>
- </plugin>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/access-tests/src/test/java/org/apache/access/tests/e2e/TestMetadataObjectRetrieval.java b/access-tests/src/test/java/org/apache/access/tests/e2e/TestMetadataObjectRetrieval.java
index a604d47..c5428df 100644
--- a/access-tests/src/test/java/org/apache/access/tests/e2e/TestMetadataObjectRetrieval.java
+++ b/access-tests/src/test/java/org/apache/access/tests/e2e/TestMetadataObjectRetrieval.java
@@ -71,27 +71,27 @@
statement.execute("USE " + db);
ResultSet rs = statement.executeQuery("DESCRIBE " + table);
assertTrue(rs.next());
- assertTrue("describe table fail", rs.getString(1).equals("under_col"));
- assertTrue("describe table fail", rs.getString(2).equals("int"));
+ assertTrue("describe table fail", rs.getString(1).trim().equals("under_col"));
+ assertTrue("describe table fail", rs.getString(2).trim().equals("int"));
assertTrue(rs.next());
- assertTrue("describe table fail", rs.getString(1).equals("value"));
- assertTrue("describe table fail", rs.getString(2).equals("string"));
+ assertTrue("describe table fail", rs.getString(1).trim().equals("value"));
+ assertTrue("describe table fail", rs.getString(2).trim().equals("string"));
rs = statement.executeQuery("DESCRIBE " + table + " under_col");
assertTrue(rs.next());
- assertTrue("describe table fail", rs.getString(1).equals("under_col"));
- assertTrue("describe table fail", rs.getString(2).equals("int"));
+ assertTrue("describe table fail", rs.getString(1).trim().equals("under_col"));
+ assertTrue("describe table fail", rs.getString(2).trim().equals("int"));
rs = statement.executeQuery("DESCRIBE " + table + " value");
assertTrue(rs.next());
- assertTrue("describe table fail", rs.getString(1).equals("value"));
- assertTrue("describe table fail", rs.getString(2).equals("string"));
+ assertTrue("describe table fail", rs.getString(1).trim().equals("value"));
+ assertTrue("describe table fail", rs.getString(2).trim().equals("string"));
rs = statement.executeQuery("SHOW COLUMNS FROM " + table);
assertTrue(rs.next());
- assertTrue("show columns from fail", rs.getString(1).equals("under_col"));
+ assertTrue("show columns from fail", rs.getString(1).trim().equals("under_col"));
assertTrue(rs.next());
- assertTrue("show columns from fail", rs.getString(1).equals("value"));
+ assertTrue("show columns from fail", rs.getString(1).trim().equals("value"));
rs = statement.executeQuery("SHOW CREATE TABLE " + table);
assertTrue("SHOW CREATE TABLE fail", rs.next());
diff --git a/pom.xml b/pom.xml
index c0dde8b..3966424 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,9 @@
<hadoop.tarball>"http://archive.cloudera.com/cdh4/cdh/4/hadoop-latest.tar.gz"</hadoop.tarball>
<hive.tarball>"http://archive.cloudera.com/cdh4/cdh/4/hive-latest.tar.gz"</hive.tarball>
<test-dfs.exclude>**/TestSimplePolicyEngineDFS.java</test-dfs.exclude>
- <static-dfs.exclude>**/AbstractTestWithStaticDFS.java</static-dfs.exclude>
+ <dfs1.exclude>**/AbstractTestWithStaticDFS.java</dfs1.exclude>
+ <dfs2.exclude>**/TestSandboxOps.java</dfs2.exclude>
+ <dfs3.exclude>**/TestExportImportPrivileges.java</dfs3.exclude>
</properties>
</profile>
<profile>
@@ -77,7 +79,7 @@
<activation>
<property>
<name>hadoop-distro</name>
- <value>apache</value>
+ <value>cdh</value>
</property>
</activation>
<properties>
@@ -88,7 +90,9 @@
<hadoop.tarball>"http://archive.cloudera.com/cdh4/cdh/4/hadoop-latest.tar.gz"</hadoop.tarball>
<hive.tarball>"http://archive.cloudera.com/cdh4/cdh/4/hive-latest.tar.gz"</hive.tarball>
<test-dfs.exclude>foo.java</test-dfs.exclude>
- <static-dfs.exclude>foo.java</static-dfs.exclude>
+ <dfs1.exclude>**/foo.java</dfs1.exclude>
+ <dfs2.exclude>**/foo.java</dfs2.exclude>
+ <dfs3.exclude>**/foo.java</dfs3.exclude>
</properties>
</profile>
</profiles>
@@ -316,7 +320,9 @@
<target>${maven.compile.target}</target>
<excludes>
<exclude>${test-dfs.exclude}</exclude>
- <exclude>${static-dfs.exclude}</exclude>
+ <exclude>${dfs1.exclude}</exclude>
+ <exclude>${dfs2.exclude}</exclude>
+ <exclude>${dfs3.exclude}</exclude>
</excludes>
</configuration>
<executions>
@@ -326,7 +332,9 @@
<configuration>
<testExcludes>
<exclude>${test-dfs.exclude}</exclude>
- <exclude>${static-dfs.exclude}</exclude>
+ <exclude>${dfs1.exclude}</exclude>
+ <exclude>${dfs2.exclude}</exclude>
+ <exclude>${dfs3.exclude}</exclude>
</testExcludes>
</configuration>
<goals>
