Skip to content

Commit c904690

Browse files
committed
修改版本和group
1 parent c050383 commit c904690

File tree

10 files changed

+42
-17
lines changed

10 files changed

+42
-17
lines changed

build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ apply plugin: 'java'
22
apply plugin: 'maven'
33
apply plugin: 'eclipse'
44
apply plugin: 'idea'
5-
apply plugin: 'spring-boot'
5+
apply plugin: 'org.springframework.boot'
66

7-
group = 'jthink'
7+
group = 'spring4all'
88
version = '0.0.1'
99

1010
sourceCompatibility = 1.7
@@ -16,10 +16,10 @@ ext {
1616
mavenPublicUrl = 'http://192.168.88.8:8081/nexus/content/repositories/public'
1717
mavenReleaseUrl = 'http://192.168.88.8:8081/nexus/content/repositories/releases'
1818
mavenSnapshotUrl = 'http://192.168.88.8:8081/nexus/content/repositories/snapshots'
19-
springBootVersion = '1.3.6.RELEASE'
19+
springBootVersion = '1.5.6.RELEASE'
2020
springVersion = '4.2.7.RELEASE'
21-
hbaseVersion = '1.0.0-cdh5.4.0'
22-
slf4jVersion = '1.7.21'
21+
hbaseVersion = '1.0.0-cdh5.4.4'
22+
slf4jVersion = '1.7.25'
2323
}
2424

2525
repositories {
@@ -66,7 +66,7 @@ dependencies {
6666

6767
buildscript {
6868
ext {
69-
springBootVersion = '1.3.6.RELEASE'
69+
springBootVersion = '1.5.6.RELEASE'
7070
}
7171

7272
repositories {
@@ -77,6 +77,6 @@ buildscript {
7777

7878
dependencies {
7979
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
80-
classpath("io.spring.gradle:dependency-management-plugin:0.6.0.RELEASE")
80+
classpath("io.spring.gradle:dependency-management-plugin:1.0.3.RELEASE")
8181
}
8282
}

src/main/java/com/jthink/spring/boot/starter/hbase/api/HbaseOperations.java renamed to src/main/java/com/spring4all/spring/boot/starter/hbase/api/HbaseOperations.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jthink.spring.boot.starter.hbase.api;
1+
package com.spring4all.spring.boot.starter.hbase.api;
22

33
import org.apache.hadoop.hbase.client.Mutation;
44
import org.apache.hadoop.hbase.client.Scan;

src/main/java/com/jthink/spring/boot/starter/hbase/api/HbaseSystemException.java renamed to src/main/java/com/spring4all/spring/boot/starter/hbase/api/HbaseSystemException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jthink.spring.boot.starter.hbase.api;
1+
package com.spring4all.spring.boot.starter.hbase.api;
22

33
import org.springframework.dao.UncategorizedDataAccessException;
44

src/main/java/com/jthink/spring/boot/starter/hbase/api/HbaseTemplate.java renamed to src/main/java/com/spring4all/spring/boot/starter/hbase/api/HbaseTemplate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jthink.spring.boot.starter.hbase.api;
1+
package com.spring4all.spring.boot.starter.hbase.api;
22

33
import org.apache.commons.lang.StringUtils;
44
import org.apache.hadoop.conf.Configuration;

src/main/java/com/jthink/spring/boot/starter/hbase/api/MutatorCallback.java renamed to src/main/java/com/spring4all/spring/boot/starter/hbase/api/MutatorCallback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jthink.spring.boot.starter.hbase.api;
1+
package com.spring4all.spring.boot.starter.hbase.api;
22

33
import org.apache.hadoop.hbase.client.BufferedMutator;
44

src/main/java/com/jthink/spring/boot/starter/hbase/api/RowMapper.java renamed to src/main/java/com/spring4all/spring/boot/starter/hbase/api/RowMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jthink.spring.boot.starter.hbase.api;
1+
package com.spring4all.spring.boot.starter.hbase.api;
22

33
import org.apache.hadoop.hbase.client.Result;
44

src/main/java/com/jthink/spring/boot/starter/hbase/api/TableCallback.java renamed to src/main/java/com/spring4all/spring/boot/starter/hbase/api/TableCallback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jthink.spring.boot.starter.hbase.api;
1+
package com.spring4all.spring.boot.starter.hbase.api;
22

33
import org.apache.hadoop.hbase.client.Table;
44

src/main/java/com/jthink/spring/boot/starter/hbase/boot/HbaseAutoConfiguration.java renamed to src/main/java/com/spring4all/spring/boot/starter/hbase/boot/HbaseAutoConfiguration.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.jthink.spring.boot.starter.hbase.boot;
1+
package com.spring4all.spring.boot.starter.hbase.boot;
22

3-
import com.jthink.spring.boot.starter.hbase.api.HbaseTemplate;
3+
import com.spring4all.spring.boot.starter.hbase.api.HbaseTemplate;
44
import org.apache.hadoop.conf.Configuration;
55
import org.apache.hadoop.hbase.HBaseConfiguration;
66
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +23,9 @@
2323
public class HbaseAutoConfiguration {
2424

2525
private static final String HBASE_QUORUM = "hbase.zookeeper.quorum";
26+
private static final String HBASE_ROOTDIR = "hbase.rootdir";
27+
private static final String HBASE_ZNODE_PARENT = "zookeeper.znode.parent";
28+
2629

2730
@Autowired
2831
private HbaseProperties hbaseProperties;
@@ -32,6 +35,8 @@ public class HbaseAutoConfiguration {
3235
public HbaseTemplate hbaseTemplate() {
3336
Configuration configuration = HBaseConfiguration.create();
3437
configuration.set(HBASE_QUORUM, this.hbaseProperties.getQuorum());
38+
configuration.set(HBASE_ROOTDIR, hbaseProperties.getRootDir());
39+
configuration.set(HBASE_ZNODE_PARENT, hbaseProperties.getNodeParent());
3540
return new HbaseTemplate(configuration);
3641
}
3742
}

src/main/java/com/jthink/spring/boot/starter/hbase/boot/HbaseProperties.java renamed to src/main/java/com/spring4all/spring/boot/starter/hbase/boot/HbaseProperties.java

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jthink.spring.boot.starter.hbase.boot;
1+
package com.spring4all.spring.boot.starter.hbase.boot;
22

33
import org.springframework.boot.context.properties.ConfigurationProperties;
44

@@ -15,11 +15,31 @@ public class HbaseProperties {
1515

1616
private String quorum;
1717

18+
private String rootDir;
19+
20+
private String nodeParent;
21+
1822
public String getQuorum() {
1923
return quorum;
2024
}
2125

2226
public void setQuorum(String quorum) {
2327
this.quorum = quorum;
2428
}
29+
30+
public String getRootDir() {
31+
return rootDir;
32+
}
33+
34+
public void setRootDir(String rootDir) {
35+
this.rootDir = rootDir;
36+
}
37+
38+
public String getNodeParent() {
39+
return nodeParent;
40+
}
41+
42+
public void setNodeParent(String nodeParent) {
43+
this.nodeParent = nodeParent;
44+
}
2545
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
2-
com.jthink.spring.boot.starter.hbase.boot.HbaseAutoConfiguration
2+
com.spring4all.spring.boot.starter.hbase.boot.HbaseAutoConfiguration

0 commit comments

Comments
 (0)