Move build to root folder, include both dumper and client tools (#11

)

* Move gradle configuration up one level

* Workaround api() not getting pinned versions from buildSrc/conventions

* Gradle, build package with both client and dumper

* Update ignore files to ignore dot-folders

* Fix bin/dwg-migration-dumper to invoke new build layout

.gitignore

@@ -5,4 +5,4 @@ build
 *~
 *#
 *.pyc
-
+.gradle

bin/dwh-migration-dumper

@@ -3,7 +3,7 @@
 BIN=$(dirname $(readlink -f $0))/../dumper/app/build/install/app/bin/dwh-migration-dumper
 
 if [ ! -x "$BIN" ] ; then
-	(cd dumper && ./gradlew --parallel :app:installDist)
+	./gradlew --parallel :dumper:app:installDist
 fi
 
 exec "$BIN" "$@"

build.gradle

@@ -0,0 +1,21 @@
+apply {
+    plugin 'java-library-distribution'
+}
+
+distributions {
+    published {
+        distributionBaseName = "dwh-migration-tools"
+        contents {
+            from("client") {
+                exclude "**/__pycache__"
+                into "client"
+            }
+            from("bin/dwh-migration-client") {
+                into "bin"
+            }
+            project(":dumper:app").afterEvaluate {
+                from it.tasks.installPublishedDist
+            }
+        }
+    }
+}

dumper/app/build.gradle

@@ -33,10 +33,10 @@ configurations {
 }
 
 dependencies {
-    implementation project(':lib-common')
-    implementation project(':lib-dumper-spi')
-    implementation project(':lib-ext-bigquery')
-    implementation project(':lib-ext-hive-metastore')
+    implementation project(':dumper:lib-common')
+    implementation project(':dumper:lib-dumper-spi')
+    implementation project(':dumper:lib-ext-bigquery')
+    implementation project(':dumper:lib-ext-hive-metastore')
 
     implementation "com.google.guava:guava"
     implementation "net.sf.jopt-simple:jopt-simple"
@@ -48,12 +48,14 @@ dependencies {
     implementation "org.springframework:spring-jdbc"
     implementation "com.zaxxer:HikariCP"
     implementation "com.swrve:rate-limited-logger"
+    implementation "com.fasterxml.jackson.core:jackson-databind"
     implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
+    implementation "com.google.cloud:google-cloud-bigquery"
 
     runtimeOnly "ch.qos.logback:logback-classic"
     runtimeOnly "org.slf4j:jcl-over-slf4j"
 
-    testFixturesApi testFixtures(project(':lib-common'))
+    testFixturesApi testFixtures(project(':dumper:lib-common'))
 
     testImplementation "org.xerial:sqlite-jdbc"
     testImplementation "org.postgresql:postgresql"

dumper/lib-dumper-spi/build.gradle

@@ -19,6 +19,6 @@ plugins {
 }
 
 dependencies {
-	api "com.fasterxml.jackson.core:jackson-databind"
+	implementation "com.fasterxml.jackson.core:jackson-databind"
 	implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
 }

dumper/lib-ext-bigquery/build.gradle

@@ -20,5 +20,5 @@ plugins {
 
 dependencies {
 	implementation "com.swrve:rate-limited-logger"
-	api "com.google.cloud:google-cloud-bigquery"
+	implementation "com.google.cloud:google-cloud-bigquery"
 }

settings.gradle

@@ -0,0 +1,8 @@
+rootProject.name = 'dwh-migration-dumper'
+include(
+	':dumper:lib-common',
+	':dumper:lib-dumper-spi',
+	':dumper:lib-ext-bigquery',
+	':dumper:lib-ext-hive-metastore',
+	':dumper:app'
+)