Skip to content

Commit 891df30

Browse files
author
lile
committed
"update code to v1.7.2."
1 parent 8f3ff7e commit 891df30

File tree

426 files changed

+4430
-10646
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

426 files changed

+4430
-10646
lines changed

‎ocnosql/ocnosql-client/pom.xml‎

Lines changed: 57 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,41 @@
44
<parent>
55
<artifactId>ocnosql</artifactId>
66
<groupId>com.ailk.oci</groupId>
7-
<version>V01B07C02</version>
7+
<version>V01B07C02-SNAPSHOT</version>
88
</parent>
99
<artifactId>ocnosql-client</artifactId>
1010
<packaging>jar</packaging>
1111

1212
<name>ocnosql-client</name>
1313
<url>http://maven.apache.org</url>
14-
<properties>
14+
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
</properties>
1717
<dependencies>
1818
<dependency>
19-
<groupId>com.salesforce</groupId>
20-
<artifactId>phoenix-client</artifactId>
21-
<version>2.1.0</version>
22-
</dependency>
23-
<dependency>
19+
<groupId>org.apache.phoenix</groupId>
20+
<artifactId>phoenix</artifactId>
21+
<classifier>minimal</classifier>
22+
</dependency>
23+
<dependency>
24+
<groupId>net.sf.opencsv</groupId>
25+
<artifactId>opencsv</artifactId>
26+
</dependency>
27+
<dependency>
2428
<groupId>com.alibaba</groupId>
2529
<artifactId>druid</artifactId>
2630
<version>1.0.0</version>
2731
</dependency>
28-
<dependency>
32+
<!-- <dependency>
2933
<groupId>com.ailk.oci</groupId>
3034
<artifactId>ocnosql-dao</artifactId>
31-
<version>${project.version}</version>
32-
</dependency>
35+
<version>${project.version}</version>
36+
</dependency>-->
37+
<dependency>
38+
<groupId>com.ailk.oci</groupId>
39+
<artifactId>ocnosql-common</artifactId>
40+
<version>${project.version}</version>
41+
</dependency>
3342
<dependency>
3443
<groupId>commons-dbcp</groupId>
3544
<artifactId>commons-dbcp</artifactId>
@@ -47,78 +56,16 @@
4756
<type>jar</type>
4857
<scope>compile</scope>
4958
</dependency>
50-
<dependency>
51-
<groupId>org.mockito</groupId>
52-
<artifactId>mockito-all</artifactId>
53-
<version>1.9.0</version>
54-
<scope>test</scope>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.apache.thrift</groupId>
58-
<artifactId>libthrift</artifactId>
59-
<version>0.9.1</version>
60-
</dependency>
61-
<dependency>
62-
<groupId>org.apache.hbase</groupId>
63-
<artifactId>hbase</artifactId>
64-
<exclusions>
65-
<exclusion>
66-
<groupId>org.mortbay.jetty</groupId>
67-
<artifactId>servlet-api-2.5</artifactId>
68-
</exclusion>
69-
<exclusion>
70-
<groupId>org.mortbay.jetty</groupId>
71-
<artifactId>jsp-api-2.1</artifactId>
72-
</exclusion>
73-
<exclusion>
74-
<groupId>org.mortbay.jetty</groupId>
75-
<artifactId>jsp-2.1</artifactId>
76-
</exclusion>
77-
<exclusion>
78-
<groupId>tomcat</groupId>
79-
<artifactId>jasper-runtime</artifactId>
80-
</exclusion>
81-
<exclusion>
82-
<groupId>tomcat</groupId>
83-
<artifactId>jasper-compiler</artifactId>
84-
</exclusion>
85-
</exclusions>
86-
</dependency>
8759
<dependency>
88-
<groupId>org.apache.hadoop</groupId>
89-
<artifactId>hadoop-common</artifactId>
90-
<exclusions>
91-
<exclusion>
92-
<groupId>javax.servlet</groupId>
93-
<artifactId>servlet-api</artifactId>
94-
</exclusion>
95-
<exclusion>
96-
<groupId>javax.servlet.jsp</groupId>
97-
<artifactId>jsp-api</artifactId>
98-
</exclusion>
99-
</exclusions>
60+
<groupId>org.mockito</groupId>
61+
<artifactId>mockito-all</artifactId>
62+
<version>1.9.0</version>
63+
<scope>test</scope>
10064
</dependency>
10165
<dependency>
102-
<groupId>org.apache.hadoop</groupId>
103-
<artifactId>hadoop-hdfs</artifactId>
104-
<exclusions>
105-
<exclusion>
106-
<groupId>tomcat</groupId>
107-
<artifactId>jasper-compiler</artifactId>
108-
</exclusion>
109-
<exclusion>
110-
<groupId>tomcat</groupId>
111-
<artifactId>jasper-runtime</artifactId>
112-
</exclusion>
113-
<exclusion>
114-
<groupId>javax.servlet</groupId>
115-
<artifactId>servlet-api</artifactId>
116-
</exclusion>
117-
<exclusion>
118-
<groupId>javax.servlet.jsp</groupId>
119-
<artifactId>jsp-api</artifactId>
120-
</exclusion>
121-
</exclusions>
66+
<groupId>org.apache.thrift</groupId>
67+
<artifactId>libthrift</artifactId>
68+
<version>0.9.1</version>
12269
</dependency>
12370
<dependency>
12471
<groupId>org.slf4j</groupId>
@@ -127,66 +74,40 @@
12774
<type>jar</type>
12875
<scope>compile</scope>
12976
</dependency>
130-
<dependency>
131-
<groupId>log4j</groupId>
132-
<artifactId>apache-log4j-extras</artifactId>
133-
<version>1.1</version>
134-
<scope>compile</scope>
135-
</dependency>
13677
<dependency>
137-
<groupId>org.apache.hadoop</groupId>
138-
<artifactId>hadoop-mapreduce-client-core</artifactId>
139-
<version>2.0.0-cdh4.3.0</version>
140-
<exclusions>
141-
<exclusion>
142-
<groupId>org.glassfish</groupId>
143-
<artifactId>javax.servlet</artifactId>
144-
</exclusion>
145-
</exclusions>
78+
<groupId>log4j</groupId>
79+
<artifactId>apache-log4j-extras</artifactId>
80+
<version>1.1</version>
81+
<scope>compile</scope>
14682
</dependency>
147-
<dependency>
148-
<groupId>org.apache.hadoop</groupId>
149-
<artifactId>hadoop-auth</artifactId>
150-
<version>2.0.0-cdh4.3.0</version>
151-
</dependency>
15283

84+
85+
86+
15387
</dependencies>
88+
<build>
89+
<plugins>
90+
<plugin>
91+
<artifactId>maven-assembly-plugin</artifactId>
92+
<executions>
93+
<execution>
94+
<id>distro-assembly</id>
95+
<phase>package</phase>
96+
<goals>
97+
<goal>single</goal>
98+
</goals>
99+
</execution>
100+
</executions>
101+
</plugin>
102+
<plugin>
103+
<groupId>org.apache.maven.plugins</groupId>
104+
<artifactId>maven-compiler-plugin</artifactId>
105+
<configuration>
106+
<source>1.6</source>
107+
<target>1.6</target>
108+
</configuration>
109+
</plugin>
110+
</plugins>
111+
</build>
154112

155-
<build>
156-
<plugins>
157-
<plugin>
158-
<artifactId>maven-assembly-plugin</artifactId>
159-
<executions>
160-
<execution>
161-
<id>distro-assembly</id>
162-
<phase>package</phase>
163-
<goals>
164-
<goal>single</goal>
165-
</goals>
166-
</execution>
167-
</executions>
168-
</plugin>
169-
<plugin>
170-
<groupId>org.apache.maven.plugins</groupId>
171-
<artifactId>maven-compiler-plugin</artifactId>
172-
<version>2.3.2</version>
173-
<configuration>
174-
<source>1.6</source>
175-
<target>1.6</target>
176-
</configuration>
177-
</plugin>
178-
<plugin>
179-
<groupId>org.apache.maven.plugins</groupId>
180-
<artifactId>maven-jar-plugin</artifactId>
181-
<version>2.3.1</version>
182-
<configuration>
183-
<archive>
184-
<manifest>
185-
<mainClass>com/ailk/oci/ocnosql/client/Driver</mainClass>
186-
</manifest>
187-
</archive>
188-
</configuration>
189-
</plugin>
190-
</plugins>
191-
</build>
192113
</project>

‎ocnosql/ocnosql-client/src/main/bin/bulkload.sh‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)