feat: Add common project to handle logic common to all services but separate from core

lpatino10 · lpatino10 · commit 009a67fe3120 · 2019-03-07T15:44:41.000-05:00
diff --git a/assistant/build.gradle b/assistant/build.gradle
@@ -55,6 +55,7 @@ checkstyle {
 }
 
 dependencies {
+    compile project(':common')
     compile 'com.ibm.cloud:sdk-core:1.2.1'
     testCompile group: 'com.ibm.cloud', name:'sdk-core', version: '1.2.1', classifier: 'tests'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
diff --git a/common/build.gradle b/common/build.gradle
@@ -0,0 +1,16 @@
+import org.apache.tools.ant.filters.*
+
+apply plugin: 'java'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile 'com.ibm.cloud:sdk-core:1.2.1'
+    testCompile group: 'com.ibm.cloud', name:'sdk-core', version: '1.2.1', classifier: 'tests'
+}
+
+processResources {
+    filter ReplaceTokens, tokens: ["pom.version": project.version]
+}
diff --git a/common/src/test/java/com/ibm/watson/common/SdkCommonTest.java b/common/src/test/java/com/ibm/watson/common/SdkCommonTest.java
@@ -0,0 +1,4 @@
+package com.ibm.watson.common;
+
+public class SdkCommonTest {
+}
diff --git a/compare-comply/build.gradle b/compare-comply/build.gradle
@@ -55,6 +55,7 @@ checkstyle {
 }
 
 dependencies {
+    compile project(':common')
     compile 'com.ibm.cloud:sdk-core:1.2.1'
     testCompile group: 'com.ibm.cloud', name:'sdk-core', version: '1.2.1', classifier: 'tests'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
diff --git a/discovery/build.gradle b/discovery/build.gradle
@@ -59,6 +59,7 @@ checkstyle {
 }
 
 dependencies {
+    compile project(':common')
     compile 'com.ibm.cloud:sdk-core:1.2.1'
     testCompile group: 'com.ibm.cloud', name:'sdk-core', version: '1.2.1', classifier: 'tests'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
diff --git a/language-translator/build.gradle b/language-translator/build.gradle
@@ -55,6 +55,7 @@ checkstyle {
 }
 
 dependencies {
+    compile project(':common')
     compile 'com.ibm.cloud:sdk-core:1.2.1'
     testCompile group: 'com.ibm.cloud', name:'sdk-core', version: '1.2.1', classifier: 'tests'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
diff --git a/natural-language-classifier/build.gradle b/natural-language-classifier/build.gradle
@@ -59,6 +59,7 @@ checkstyle {
 }
 
 dependencies {
+    compile project(':common')
     compile 'com.ibm.cloud:sdk-core:1.2.1'
     testCompile group: 'com.ibm.cloud', name:'sdk-core', version: '1.2.1', classifier: 'tests'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
diff --git a/natural-language-understanding/build.gradle b/natural-language-understanding/build.gradle
@@ -55,6 +55,7 @@ checkstyle {
 }
 
 dependencies {
+    compile project(':common')
     compile 'com.ibm.cloud:sdk-core:1.2.1'
     testCompile group: 'com.ibm.cloud', name:'sdk-core', version: '1.2.1', classifier: 'tests'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
diff --git a/personality-insights/build.gradle b/personality-insights/build.gradle
@@ -55,6 +55,7 @@ checkstyle {
 }
 
 dependencies {
+    compile project(':common')
     compile 'com.ibm.cloud:sdk-core:1.2.1'
     testCompile group: 'com.ibm.cloud', name:'sdk-core', version: '1.2.1', classifier: 'tests'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,4 @@
 rootProject.name = 'ibm-watson'
 include ':assistant', ':compare-comply', ':discovery', ':language-translator', ':natural-language-classifier',
         ':natural-language-understanding', ':personality-insights', ':speech-to-text', ':text-to-speech',
-        ':tone-analyzer', ':visual-recognition', ':ibm-watson'
+        ':tone-analyzer', ':visual-recognition', ':ibm-watson', ':common'
diff --git a/speech-to-text/build.gradle b/speech-to-text/build.gradle
@@ -59,6 +59,7 @@ checkstyle {
 }
 
 dependencies {
+    compile project(':common')
     compile 'com.ibm.cloud:sdk-core:1.2.1'
     testCompile group: 'com.ibm.cloud', name:'sdk-core', version: '1.2.1', classifier: 'tests'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
diff --git a/text-to-speech/build.gradle b/text-to-speech/build.gradle
@@ -55,6 +55,7 @@ checkstyle {
 }
 
 dependencies {
+    compile project(':common')
     compile 'com.ibm.cloud:sdk-core:1.2.1'
     testCompile group: 'com.ibm.cloud', name:'sdk-core', version: '1.2.1', classifier: 'tests'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
diff --git a/tone-analyzer/build.gradle b/tone-analyzer/build.gradle
@@ -55,6 +55,7 @@ checkstyle {
 }
 
 dependencies {
+    compile project(':common')
     compile 'com.ibm.cloud:sdk-core:1.2.1'
     testCompile group: 'com.ibm.cloud', name:'sdk-core', version: '1.2.1', classifier: 'tests'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
diff --git a/visual-recognition/build.gradle b/visual-recognition/build.gradle
@@ -59,6 +59,7 @@ checkstyle {
 }
 
 dependencies {
+    compile project(':common')
     compile 'com.ibm.cloud:sdk-core:1.2.1'
     testCompile group: 'com.ibm.cloud', name:'sdk-core', version: '1.2.1', classifier: 'tests'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ checkstyle {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`dependencies {`
	`58`	`+ compile project(':common')`
`58`	`59`	`compile 'com.ibm.cloud:sdk-core:1.2.1'`
`59`	`60`	`testCompile group: 'com.ibm.cloud', name:'sdk-core', version: '1.2.1', classifier: 'tests'`
`60`	`61`	`signature 'org.codehaus.mojo.signature:java17:1.0@signature'`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package com.ibm.watson.common;
++
 +public class SdkCommonTest {
 +}
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ checkstyle {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`dependencies {`
	`62`	`+ compile project(':common')`
`62`	`63`	`compile 'com.ibm.cloud:sdk-core:1.2.1'`
`63`	`64`	`testCompile group: 'com.ibm.cloud', name:'sdk-core', version: '1.2.1', classifier: 'tests'`
`64`	`65`	`signature 'org.codehaus.mojo.signature:java17:1.0@signature'`