Skip to content

Commit e6d6da6

Browse files
stuBirdFlystuBirdFly
authored
Merge pull request #76 from stuBirdFly/master
merge HBase_1.x_compatible to master
2 parents aeaca6c + d314d46 commit e6d6da6

28 files changed

+4557
-736
lines changed

‎pom.xml

Lines changed: 60 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,75 @@
4545
</distributionManagement>
4646

4747
<properties>
48-
<hadoop.version>1.2.1</hadoop.version>
49-
<hbase.version>0.98.24-hadoop1</hbase.version>
48+
<hadoop.version>2.5.1</hadoop.version>
49+
<hbase.version>1.3.6</hbase.version>
5050
<java.source.version>1.8</java.source.version>
5151
<java.target.version>1.8</java.target.version>
5252
<junit.version>4.13.1</junit.version>
5353
<powermock.version>2.0.9</powermock.version>
5454
<project.build.sourceEncoding>${project.encoding}</project.build.sourceEncoding>
5555
<project.encoding>UTF-8</project.encoding>
5656
<slf4j.version>1.7.21</slf4j.version>
57-
<table.client.version>1.2.13</table.client.version>
57+
<table.client.version>1.2.14.1-SNAPSHOT</table.client.version>
5858
</properties>
5959

6060
<dependencies>
61+
<dependency>
62+
<groupId>org.apache.hadoop</groupId>
63+
<artifactId>hadoop-common</artifactId>
64+
<version>${hadoop.version}</version>
65+
<exclusions>
66+
<exclusion>
67+
<artifactId>hsqldb</artifactId>
68+
<groupId>hsqldb</groupId>
69+
</exclusion>
70+
<exclusion>
71+
<artifactId>kfs</artifactId>
72+
<groupId>net.sf.kosmosfs</groupId>
73+
</exclusion>
74+
<exclusion>
75+
<artifactId>core</artifactId>
76+
<groupId>org.eclipse.jdt</groupId>
77+
</exclusion>
78+
<exclusion>
79+
<artifactId>jets3t</artifactId>
80+
<groupId>net.java.dev.jets3t</groupId>
81+
</exclusion>
82+
<exclusion>
83+
<artifactId>slf4j-log4j12</artifactId>
84+
<groupId>org.slf4j</groupId>
85+
</exclusion>
86+
<exclusion>
87+
<artifactId>oro</artifactId>
88+
<groupId>oro</groupId>
89+
</exclusion>
90+
<exclusion>
91+
<artifactId>jasper-compiler</artifactId>
92+
<groupId>tomcat</groupId>
93+
</exclusion>
94+
<exclusion>
95+
<artifactId>jasper-runtime</artifactId>
96+
<groupId>tomcat</groupId>
97+
</exclusion>
98+
<exclusion>
99+
<artifactId>jackson-mapper-asl</artifactId>
100+
<groupId>org.codehaus.jackson</groupId>
101+
</exclusion>
102+
<exclusion>
103+
<artifactId>jettison</artifactId>
104+
<groupId>org.codehaus.jettison</groupId>
105+
</exclusion>
106+
<exclusion>
107+
<artifactId>commons-collections</artifactId>
108+
<groupId>commons-collections</groupId>
109+
</exclusion>
110+
</exclusions>
111+
</dependency>
112+
<dependency>
113+
<groupId>com.oceanbase</groupId>
114+
<artifactId>obkv-table-client</artifactId>
115+
<version>${table.client.version}</version>
116+
</dependency>
61117
<dependency>
62118
<groupId>org.apache.hbase</groupId>
63119
<artifactId>hbase-client</artifactId>
@@ -117,58 +173,6 @@
117173
</exclusion>
118174
</exclusions>
119175
</dependency>
120-
<dependency>
121-
<groupId>org.apache.hadoop</groupId>
122-
<artifactId>hadoop-core</artifactId>
123-
<version>${hadoop.version}</version>
124-
<exclusions>
125-
<exclusion>
126-
<artifactId>hsqldb</artifactId>
127-
<groupId>hsqldb</groupId>
128-
</exclusion>
129-
<exclusion>
130-
<artifactId>kfs</artifactId>
131-
<groupId>net.sf.kosmosfs</groupId>
132-
</exclusion>
133-
<exclusion>
134-
<artifactId>core</artifactId>
135-
<groupId>org.eclipse.jdt</groupId>
136-
</exclusion>
137-
<exclusion>
138-
<artifactId>jets3t</artifactId>
139-
<groupId>net.java.dev.jets3t</groupId>
140-
</exclusion>
141-
<exclusion>
142-
<artifactId>oro</artifactId>
143-
<groupId>oro</groupId>
144-
</exclusion>
145-
<exclusion>
146-
<artifactId>jasper-compiler</artifactId>
147-
<groupId>tomcat</groupId>
148-
</exclusion>
149-
<exclusion>
150-
<artifactId>jasper-runtime</artifactId>
151-
<groupId>tomcat</groupId>
152-
</exclusion>
153-
<exclusion>
154-
<artifactId>jackson-mapper-asl</artifactId>
155-
<groupId>org.codehaus.jackson</groupId>
156-
</exclusion>
157-
<exclusion>
158-
<artifactId>jettison</artifactId>
159-
<groupId>org.codehaus.jettison</groupId>
160-
</exclusion>
161-
<exclusion>
162-
<artifactId>commons-collections</artifactId>
163-
<groupId>commons-collections</groupId>
164-
</exclusion>
165-
</exclusions>
166-
</dependency>
167-
<dependency>
168-
<groupId>com.oceanbase</groupId>
169-
<artifactId>obkv-table-client</artifactId>
170-
<version>${table.client.version}</version>
171-
</dependency>
172176
<dependency>
173177
<groupId>org.slf4j</groupId>
174178
<artifactId>slf4j-api</artifactId>
@@ -403,5 +407,5 @@
403407
</plugin>
404408
</plugins>
405409
</build>
406-
<profiles />
410+
<profiles></profiles>
407411
</project>

0 commit comments

Comments
 (0)