This is an automated email from the ASF dual-hosted git repository.
reidchan pushed a commit to branch branch-1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-1 by this push:
new c364443 HBASE-25831 [branch-1] remove thrift examples out of
hbase-examples module for bypassing the thrift version check (#3212)
c364443 is described below
commit c364443e5cb615e4c67cdb38a989674d5419a659
Author: Reid Chan <[email protected]>
AuthorDate: Thu May 6 11:39:33 2021 +0800
HBASE-25831 [branch-1] remove thrift examples out of hbase-examples module
for bypassing the thrift version check (#3212)
---
hbase-examples/pom.xml | 8 --------
hbase-thrift/pom.xml | 8 ++++----
{hbase-examples => hbase-thrift}/src/main/cpp/DemoClient.cpp | 0
{hbase-examples => hbase-thrift}/src/main/cpp/Makefile | 0
{hbase-examples => hbase-thrift}/src/main/cpp/gen-cpp/Hbase.cpp | 0
{hbase-examples => hbase-thrift}/src/main/cpp/gen-cpp/Hbase.h | 0
.../src/main/cpp/gen-cpp/Hbase_constants.cpp | 0
.../src/main/cpp/gen-cpp/Hbase_constants.h | 0
.../src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp | 0
.../src/main/cpp/gen-cpp/Hbase_types.cpp | 0
.../src/main/cpp/gen-cpp/Hbase_types.h | 0
.../src/main/java/org/apache/hadoop/hbase/thrift/DemoClient.java | 0
.../main/java/org/apache/hadoop/hbase/thrift/HttpDoAsClient.java | 0
.../src/main/java/org/apache/hadoop/hbase/thrift2/DemoClient.java | 0
{hbase-examples => hbase-thrift}/src/main/perl/DemoClient.pl | 0
.../src/main/perl/gen-perl/Hbase/Constants.pm | 0
.../src/main/perl/gen-perl/Hbase/Hbase.pm | 0
.../src/main/perl/gen-perl/Hbase/Types.pm | 0
{hbase-examples => hbase-thrift}/src/main/php/DemoClient.php | 0
.../src/main/php/gen-php/Hbase/Hbase.php | 0
.../src/main/php/gen-php/Hbase/Types.php | 0
.../src/main/python/thrift1/DemoClient.py | 0
.../src/main/python/thrift1/gen-py/hbase/Hbase-remote | 0
.../src/main/python/thrift1/gen-py/hbase/Hbase.py | 0
.../src/main/python/thrift1/gen-py/hbase/__init__.py | 0
.../src/main/python/thrift1}/gen-py/hbase/constants.py | 0
.../src/main/python/thrift1/gen-py/hbase/ttypes.py | 0
.../src/main/python/thrift2/DemoClient.py | 0
.../src/main/python/thrift2/gen-py/hbase/THBaseService-remote | 0
.../src/main/python/thrift2/gen-py/hbase/THBaseService.py | 0
.../src/main/python/thrift2/gen-py/hbase/__init__.py | 0
.../src/main/python/thrift2}/gen-py/hbase/constants.py | 0
.../src/main/python/thrift2/gen-py/hbase/ttypes.py | 0
{hbase-examples => hbase-thrift}/src/main/ruby/DemoClient.rb | 0
{hbase-examples => hbase-thrift}/src/main/ruby/gen-rb/hbase.rb | 0
.../src/main/ruby/gen-rb/hbase_constants.rb | 0
.../src/main/ruby/gen-rb/hbase_types.rb | 0
.../src/main/ruby/index-builder-setup.rb | 0
38 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index 01d98a3..d902cfd 100644
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -184,20 +184,12 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-thrift</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-testing-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index 8b9baef..a752ba7 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -349,10 +349,10 @@
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<exclusions>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/hbase-examples/src/main/cpp/DemoClient.cpp
b/hbase-thrift/src/main/cpp/DemoClient.cpp
similarity index 100%
rename from hbase-examples/src/main/cpp/DemoClient.cpp
rename to hbase-thrift/src/main/cpp/DemoClient.cpp
diff --git a/hbase-examples/src/main/cpp/Makefile
b/hbase-thrift/src/main/cpp/Makefile
similarity index 100%
rename from hbase-examples/src/main/cpp/Makefile
rename to hbase-thrift/src/main/cpp/Makefile
diff --git a/hbase-examples/src/main/cpp/gen-cpp/Hbase.cpp
b/hbase-thrift/src/main/cpp/gen-cpp/Hbase.cpp
similarity index 100%
rename from hbase-examples/src/main/cpp/gen-cpp/Hbase.cpp
rename to hbase-thrift/src/main/cpp/gen-cpp/Hbase.cpp
diff --git a/hbase-examples/src/main/cpp/gen-cpp/Hbase.h
b/hbase-thrift/src/main/cpp/gen-cpp/Hbase.h
similarity index 100%
rename from hbase-examples/src/main/cpp/gen-cpp/Hbase.h
rename to hbase-thrift/src/main/cpp/gen-cpp/Hbase.h
diff --git a/hbase-examples/src/main/cpp/gen-cpp/Hbase_constants.cpp
b/hbase-thrift/src/main/cpp/gen-cpp/Hbase_constants.cpp
similarity index 100%
rename from hbase-examples/src/main/cpp/gen-cpp/Hbase_constants.cpp
rename to hbase-thrift/src/main/cpp/gen-cpp/Hbase_constants.cpp
diff --git a/hbase-examples/src/main/cpp/gen-cpp/Hbase_constants.h
b/hbase-thrift/src/main/cpp/gen-cpp/Hbase_constants.h
similarity index 100%
rename from hbase-examples/src/main/cpp/gen-cpp/Hbase_constants.h
rename to hbase-thrift/src/main/cpp/gen-cpp/Hbase_constants.h
diff --git a/hbase-examples/src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp
b/hbase-thrift/src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp
similarity index 100%
rename from hbase-examples/src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp
rename to hbase-thrift/src/main/cpp/gen-cpp/Hbase_server.skeleton.cpp
diff --git a/hbase-examples/src/main/cpp/gen-cpp/Hbase_types.cpp
b/hbase-thrift/src/main/cpp/gen-cpp/Hbase_types.cpp
similarity index 100%
rename from hbase-examples/src/main/cpp/gen-cpp/Hbase_types.cpp
rename to hbase-thrift/src/main/cpp/gen-cpp/Hbase_types.cpp
diff --git a/hbase-examples/src/main/cpp/gen-cpp/Hbase_types.h
b/hbase-thrift/src/main/cpp/gen-cpp/Hbase_types.h
similarity index 100%
rename from hbase-examples/src/main/cpp/gen-cpp/Hbase_types.h
rename to hbase-thrift/src/main/cpp/gen-cpp/Hbase_types.h
diff --git
a/hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift/DemoClient.java
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/DemoClient.java
similarity index 100%
rename from
hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift/DemoClient.java
rename to
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/DemoClient.java
diff --git
a/hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift/HttpDoAsClient.java
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/HttpDoAsClient.java
similarity index 100%
rename from
hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift/HttpDoAsClient.java
rename to
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/HttpDoAsClient.java
diff --git
a/hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift2/DemoClient.java
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/DemoClient.java
similarity index 100%
rename from
hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift2/DemoClient.java
rename to
hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/DemoClient.java
diff --git a/hbase-examples/src/main/perl/DemoClient.pl
b/hbase-thrift/src/main/perl/DemoClient.pl
similarity index 100%
rename from hbase-examples/src/main/perl/DemoClient.pl
rename to hbase-thrift/src/main/perl/DemoClient.pl
diff --git a/hbase-examples/src/main/perl/gen-perl/Hbase/Constants.pm
b/hbase-thrift/src/main/perl/gen-perl/Hbase/Constants.pm
similarity index 100%
rename from hbase-examples/src/main/perl/gen-perl/Hbase/Constants.pm
rename to hbase-thrift/src/main/perl/gen-perl/Hbase/Constants.pm
diff --git a/hbase-examples/src/main/perl/gen-perl/Hbase/Hbase.pm
b/hbase-thrift/src/main/perl/gen-perl/Hbase/Hbase.pm
similarity index 100%
rename from hbase-examples/src/main/perl/gen-perl/Hbase/Hbase.pm
rename to hbase-thrift/src/main/perl/gen-perl/Hbase/Hbase.pm
diff --git a/hbase-examples/src/main/perl/gen-perl/Hbase/Types.pm
b/hbase-thrift/src/main/perl/gen-perl/Hbase/Types.pm
similarity index 100%
rename from hbase-examples/src/main/perl/gen-perl/Hbase/Types.pm
rename to hbase-thrift/src/main/perl/gen-perl/Hbase/Types.pm
diff --git a/hbase-examples/src/main/php/DemoClient.php
b/hbase-thrift/src/main/php/DemoClient.php
similarity index 100%
rename from hbase-examples/src/main/php/DemoClient.php
rename to hbase-thrift/src/main/php/DemoClient.php
diff --git a/hbase-examples/src/main/php/gen-php/Hbase/Hbase.php
b/hbase-thrift/src/main/php/gen-php/Hbase/Hbase.php
similarity index 100%
rename from hbase-examples/src/main/php/gen-php/Hbase/Hbase.php
rename to hbase-thrift/src/main/php/gen-php/Hbase/Hbase.php
diff --git a/hbase-examples/src/main/php/gen-php/Hbase/Types.php
b/hbase-thrift/src/main/php/gen-php/Hbase/Types.php
similarity index 100%
rename from hbase-examples/src/main/php/gen-php/Hbase/Types.php
rename to hbase-thrift/src/main/php/gen-php/Hbase/Types.php
diff --git a/hbase-examples/src/main/python/thrift1/DemoClient.py
b/hbase-thrift/src/main/python/thrift1/DemoClient.py
similarity index 100%
rename from hbase-examples/src/main/python/thrift1/DemoClient.py
rename to hbase-thrift/src/main/python/thrift1/DemoClient.py
diff --git a/hbase-examples/src/main/python/thrift1/gen-py/hbase/Hbase-remote
b/hbase-thrift/src/main/python/thrift1/gen-py/hbase/Hbase-remote
similarity index 100%
rename from hbase-examples/src/main/python/thrift1/gen-py/hbase/Hbase-remote
rename to hbase-thrift/src/main/python/thrift1/gen-py/hbase/Hbase-remote
diff --git a/hbase-examples/src/main/python/thrift1/gen-py/hbase/Hbase.py
b/hbase-thrift/src/main/python/thrift1/gen-py/hbase/Hbase.py
similarity index 100%
rename from hbase-examples/src/main/python/thrift1/gen-py/hbase/Hbase.py
rename to hbase-thrift/src/main/python/thrift1/gen-py/hbase/Hbase.py
diff --git a/hbase-examples/src/main/python/thrift1/gen-py/hbase/__init__.py
b/hbase-thrift/src/main/python/thrift1/gen-py/hbase/__init__.py
similarity index 100%
rename from hbase-examples/src/main/python/thrift1/gen-py/hbase/__init__.py
rename to hbase-thrift/src/main/python/thrift1/gen-py/hbase/__init__.py
diff --git a/hbase-examples/src/main/python/thrift2/gen-py/hbase/constants.py
b/hbase-thrift/src/main/python/thrift1/gen-py/hbase/constants.py
similarity index 100%
rename from hbase-examples/src/main/python/thrift2/gen-py/hbase/constants.py
rename to hbase-thrift/src/main/python/thrift1/gen-py/hbase/constants.py
diff --git a/hbase-examples/src/main/python/thrift1/gen-py/hbase/ttypes.py
b/hbase-thrift/src/main/python/thrift1/gen-py/hbase/ttypes.py
similarity index 100%
rename from hbase-examples/src/main/python/thrift1/gen-py/hbase/ttypes.py
rename to hbase-thrift/src/main/python/thrift1/gen-py/hbase/ttypes.py
diff --git a/hbase-examples/src/main/python/thrift2/DemoClient.py
b/hbase-thrift/src/main/python/thrift2/DemoClient.py
similarity index 100%
rename from hbase-examples/src/main/python/thrift2/DemoClient.py
rename to hbase-thrift/src/main/python/thrift2/DemoClient.py
diff --git
a/hbase-examples/src/main/python/thrift2/gen-py/hbase/THBaseService-remote
b/hbase-thrift/src/main/python/thrift2/gen-py/hbase/THBaseService-remote
similarity index 100%
rename from
hbase-examples/src/main/python/thrift2/gen-py/hbase/THBaseService-remote
rename to hbase-thrift/src/main/python/thrift2/gen-py/hbase/THBaseService-remote
diff --git
a/hbase-examples/src/main/python/thrift2/gen-py/hbase/THBaseService.py
b/hbase-thrift/src/main/python/thrift2/gen-py/hbase/THBaseService.py
similarity index 100%
rename from hbase-examples/src/main/python/thrift2/gen-py/hbase/THBaseService.py
rename to hbase-thrift/src/main/python/thrift2/gen-py/hbase/THBaseService.py
diff --git a/hbase-examples/src/main/python/thrift2/gen-py/hbase/__init__.py
b/hbase-thrift/src/main/python/thrift2/gen-py/hbase/__init__.py
similarity index 100%
rename from hbase-examples/src/main/python/thrift2/gen-py/hbase/__init__.py
rename to hbase-thrift/src/main/python/thrift2/gen-py/hbase/__init__.py
diff --git a/hbase-examples/src/main/python/thrift1/gen-py/hbase/constants.py
b/hbase-thrift/src/main/python/thrift2/gen-py/hbase/constants.py
similarity index 100%
rename from hbase-examples/src/main/python/thrift1/gen-py/hbase/constants.py
rename to hbase-thrift/src/main/python/thrift2/gen-py/hbase/constants.py
diff --git a/hbase-examples/src/main/python/thrift2/gen-py/hbase/ttypes.py
b/hbase-thrift/src/main/python/thrift2/gen-py/hbase/ttypes.py
similarity index 100%
rename from hbase-examples/src/main/python/thrift2/gen-py/hbase/ttypes.py
rename to hbase-thrift/src/main/python/thrift2/gen-py/hbase/ttypes.py
diff --git a/hbase-examples/src/main/ruby/DemoClient.rb
b/hbase-thrift/src/main/ruby/DemoClient.rb
similarity index 100%
rename from hbase-examples/src/main/ruby/DemoClient.rb
rename to hbase-thrift/src/main/ruby/DemoClient.rb
diff --git a/hbase-examples/src/main/ruby/gen-rb/hbase.rb
b/hbase-thrift/src/main/ruby/gen-rb/hbase.rb
similarity index 100%
rename from hbase-examples/src/main/ruby/gen-rb/hbase.rb
rename to hbase-thrift/src/main/ruby/gen-rb/hbase.rb
diff --git a/hbase-examples/src/main/ruby/gen-rb/hbase_constants.rb
b/hbase-thrift/src/main/ruby/gen-rb/hbase_constants.rb
similarity index 100%
rename from hbase-examples/src/main/ruby/gen-rb/hbase_constants.rb
rename to hbase-thrift/src/main/ruby/gen-rb/hbase_constants.rb
diff --git a/hbase-examples/src/main/ruby/gen-rb/hbase_types.rb
b/hbase-thrift/src/main/ruby/gen-rb/hbase_types.rb
similarity index 100%
rename from hbase-examples/src/main/ruby/gen-rb/hbase_types.rb
rename to hbase-thrift/src/main/ruby/gen-rb/hbase_types.rb
diff --git a/hbase-examples/src/main/ruby/index-builder-setup.rb
b/hbase-thrift/src/main/ruby/index-builder-setup.rb
similarity index 100%
rename from hbase-examples/src/main/ruby/index-builder-setup.rb
rename to hbase-thrift/src/main/ruby/index-builder-setup.rb
