Skip to content
This repository was archived by the owner on Apr 5, 2022. It is now read-only.

Commit a69c199

Browse files
committed
SHDP-525 Separate namespace support from annotation config
- creating new spring-hadoop-namespace sub-project for spring-data-hadoop alias - moving namespace classes to spring-hadoop-namespace - changing spring-hadoop-config to have alias spring-data-hadoop-config - switching dependencies for spring-data-hadoop-boot to use spring-data-hadoop-config
1 parent ea0f17b commit a69c199

40 files changed

+19
-6
lines changed

build.gradle

+16-5
Original file line numberDiff line numberDiff line change
@@ -753,11 +753,12 @@ project('spring-data-hadoop-store') {
753753
}
754754

755755
dependencies {
756-
compile project(":spring-data-hadoop")
756+
compile project(":spring-data-hadoop-config")
757757
compile "org.springframework:spring-messaging:$springVersion"
758758
compile("org.kitesdk:kite-data-core:$kiteVersion") { dep ->
759759
exclude group: "log4j", module: "log4j"
760760
}
761+
testCompile project(":spring-data-hadoop")
761762
testCompile project(path:":spring-data-hadoop-test", configuration:"testArtifacts")
762763
testCompile "org.springframework:spring-test:$springVersion"
763764
testCompile("org.mockito:mockito-core:$mockitoVersion") { dep ->
@@ -834,8 +835,17 @@ project('spring-data-hadoop-sqoop2') {
834835

835836
}
836837

838+
project('spring-data-hadoop-config') {
839+
description = 'Spring for Apache Hadoop Annotation Configuration'
840+
841+
dependencies {
842+
compile project(":spring-data-hadoop-core")
843+
}
844+
845+
}
846+
837847
project('spring-data-hadoop') {
838-
description = 'Spring for Apache Hadoop Configuration'
848+
description = 'Spring for Apache Hadoop Namspace Configuration'
839849

840850
dependencies {
841851
compile project(":spring-data-hadoop-core")
@@ -851,7 +861,7 @@ project('spring-data-hadoop-boot') {
851861
description = 'Spring for Apache Hadoop Boot'
852862

853863
dependencies {
854-
compile project(":spring-data-hadoop")
864+
compile project(":spring-data-hadoop-config")
855865
compile "org.springframework.boot:spring-boot-autoconfigure:$springBootVersion"
856866
optional "org.springframework.boot:spring-boot-configuration-processor:$springBootVersion"
857867
runtime "org.yaml:snakeyaml:$snakeYamlVersion"
@@ -891,6 +901,7 @@ project('spring-data-hadoop-build-tests') {
891901
dependencies {
892902
compile project(":spring-data-hadoop-core")
893903
compile project(":spring-data-hadoop-batch")
904+
compile project(":spring-data-hadoop-config")
894905
compile project(":spring-data-hadoop")
895906
compile project(":spring-data-hadoop-test")
896907
testCompile project(path:":spring-data-hadoop-test", configuration:"testArtifacts")
@@ -1070,8 +1081,8 @@ project('spring-data-hadoop-cluster-tests') {
10701081
description = 'Spring for Apache Hadoop Cluster Tests'
10711082

10721083
dependencies {
1073-
compile project(":spring-data-hadoop-core")
10741084
compile project(":spring-data-hadoop")
1085+
compile project(":spring-data-hadoop-config")
10751086
compile project(":spring-data-hadoop-test")
10761087
testCompile project(path:":spring-data-hadoop-test", configuration:"testArtifacts")
10771088

@@ -1124,7 +1135,7 @@ project('spring-yarn') {
11241135
project('spring-yarn:spring-yarn-core') {
11251136
description = 'Spring Yarn Core'
11261137
dependencies {
1127-
compile project(":spring-data-hadoop")
1138+
compile project(":spring-data-hadoop-config")
11281139
compile "org.springframework:spring-messaging:$springVersion"
11291140
compile("org.apache.hadoop:hadoop-yarn-client:$hadoopVersion") { dep ->
11301141
exclude group: "org.slf4j", module: "slf4j-log4j12"

settings.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ rootProject.children.find{ it.name == 'spring-hadoop-spark' }.name = 'spring-dat
1717
include 'spring-hadoop-sqoop2'
1818
rootProject.children.find{ it.name == 'spring-hadoop-sqoop2' }.name = 'spring-data-hadoop-sqoop2'
1919
include 'spring-hadoop-config'
20-
rootProject.children.find{ it.name == 'spring-hadoop-config' }.name = 'spring-data-hadoop'
20+
rootProject.children.find{ it.name == 'spring-hadoop-config' }.name = 'spring-data-hadoop-config'
21+
include 'spring-hadoop-namespace'
22+
rootProject.children.find{ it.name == 'spring-hadoop-namespace' }.name = 'spring-data-hadoop'
2123
include 'spring-hadoop-test'
2224
rootProject.children.find{ it.name == 'spring-hadoop-test' }.name = 'spring-data-hadoop-test'
2325
include 'spring-hadoop-boot'

0 commit comments

Comments
 (0)