beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dhalp...@apache.org
Subject [2/3] beam git commit: [BEAM-1550] Fix HBaseIO tests and change HBaseIO to use shaded dependencies
Date Tue, 04 Apr 2017 16:01:26 GMT
[BEAM-1550] Fix HBaseIO tests and change HBaseIO to use shaded dependencies


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/6d502faa
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/6d502faa
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/6d502faa

Branch: refs/heads/master
Commit: 6d502faa318f126552151693dacb6a569b535fba
Parents: 45f63eb
Author: Ismaël Mejía <iemejia@apache.org>
Authored: Thu Mar 30 11:04:51 2017 +0200
Committer: Dan Halperin <dhalperi@google.com>
Committed: Tue Apr 4 09:01:14 2017 -0700

----------------------------------------------------------------------
 sdks/java/io/hbase/pom.xml                      | 73 +++++---------------
 .../apache/beam/sdk/io/hbase/HBaseIOTest.java   |  2 -
 2 files changed, 18 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/6d502faa/sdks/java/io/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/hbase/pom.xml b/sdks/java/io/hbase/pom.xml
index 29671a2..7b5fc6b 100644
--- a/sdks/java/io/hbase/pom.xml
+++ b/sdks/java/io/hbase/pom.xml
@@ -32,9 +32,7 @@
 
   <properties>
     <hbase.version>1.3.0</hbase.version>
-    <hbase.guava.version>12.0.1</hbase.guava.version>
-    <hbase.protobuf.version>2.5.0</hbase.protobuf.version>
-    <hadoop.version>2.5.1</hadoop.version>
+    <hbase.hadoop.version>2.5.1</hbase.hadoop.version>
   </properties>
 
   <build>
@@ -51,30 +49,9 @@
                 <goal>shade</goal>
               </goals>
               <configuration>
+              <!-- Disable the creation of the reduced pom to avoid an issue with the
shade
+                   plugin. Ref. https://issues.apache.org/jira/browse/MSHADE-148 -->
                 <createDependencyReducedPom>false</createDependencyReducedPom>
-                <artifactSet>
-                  <includes>
-                    <include>com.google.guava:guava</include>
-                    <include>com.google.protobuf:protobuf-java</include>
-                  </includes>
-                </artifactSet>
-                <relocations>
-                  <relocation>
-                    <pattern>com.google.common</pattern>
-                    <shadedPattern>org.apache.beam.sdk.io.hbase.repackaged.com.google.common</shadedPattern>
-                  </relocation>
-                  <relocation>
-                    <pattern>com.google.thirdparty</pattern>
-                    <shadedPattern>org.apache.beam.sdk.io.hbase.repackaged.com.google.thirdparty</shadedPattern>
-                  </relocation>
-                  <relocation>
-                    <pattern>com.google.protobuf</pattern>
-                    <shadedPattern>org.apache.beam.sdk.io.hbase.repackaged.com.google.protobuf</shadedPattern>
-                  </relocation>
-                </relocations>
-                <transformers>
-                  <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                </transformers>
               </configuration>
             </execution>
           </executions>
@@ -113,39 +90,19 @@
     </dependency>
 
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-shaded-client</artifactId>
+      <version>${hbase.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>${hbase.guava.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <scope>provided</scope>
-      <version>${hbase.protobuf.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-client</artifactId>
-      <version>${hbase.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-protocol</artifactId>
-      <version>${hbase.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-common</artifactId>
-      <version>${hbase.version}</version>
+      <artifactId>protobuf-lite</artifactId>
     </dependency>
 
     <dependency>
@@ -154,15 +111,14 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <version>${hadoop.version}</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
 
     <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-server</artifactId>
+      <artifactId>hbase-shaded-server</artifactId>
       <version>${hbase.version}</version>
       <scope>test</scope>
     </dependency>
@@ -178,7 +134,14 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-minicluster</artifactId>
-      <version>${hadoop.version}</version>
+      <version>${hbase.hadoop.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <version>${hbase.hadoop.version}</version>
       <scope>test</scope>
     </dependency>
 

http://git-wip-us.apache.org/repos/asf/beam/blob/6d502faa/sdks/java/io/hbase/src/test/java/org/apache/beam/sdk/io/hbase/HBaseIOTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/hbase/src/test/java/org/apache/beam/sdk/io/hbase/HBaseIOTest.java
b/sdks/java/io/hbase/src/test/java/org/apache/beam/sdk/io/hbase/HBaseIOTest.java
index 774e17e..7bfdd25 100644
--- a/sdks/java/io/hbase/src/test/java/org/apache/beam/sdk/io/hbase/HBaseIOTest.java
+++ b/sdks/java/io/hbase/src/test/java/org/apache/beam/sdk/io/hbase/HBaseIOTest.java
@@ -66,7 +66,6 @@ import org.apache.hadoop.hbase.util.Bytes;
 import org.hamcrest.Matchers;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -77,7 +76,6 @@ import org.junit.runners.JUnit4;
 /**
  * Test HBaseIO.
  */
-@Ignore
 @RunWith(JUnit4.class)
 public class HBaseIOTest {
     @Rule public final transient TestPipeline p = TestPipeline.create();


Mime
View raw message