Merge remote-tracking branch 'origin/master' into SNAP-2366

TIBCOSoftware · Nov 2, 2018 · 872bd8b · 872bd8b
2 parents f2be757 + 0c7616b
commit 872bd8b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/examples/build.gradle b/examples/build.gradle
@@ -63,6 +63,8 @@ task productExamples(dependsOn: 'jar') { doLast {
   }
 } }
 
+archivesBaseName = 'snappydata-examples_' + scalaBinaryVersion
+
 scalaTest {
   dependsOn ':cleanScalaTest', ':product'
   doFirst {

diff --git a/jdbc/build.gradle b/jdbc/build.gradle
@@ -60,11 +60,6 @@ task packageScalaDocs(type: Jar, dependsOn: scaladoc) {
   classifier = 'javadoc'
   from scaladoc
 }
-if (rootProject.hasProperty('enablePublish')) {
-  artifacts {
-    archives packageScalaDocs, packageSources, shadowJar
-  }
-}
 
 scalaTest {
   dependsOn ':cleanScalaTest'
@@ -81,8 +76,10 @@ scalaTest {
 test.dependsOn ':cleanJUnit'
 check.dependsOn test, scalaTest, dunitTest
 
+archivesBaseName = 'snappydata-jdbc_' + scalaBinaryVersion
+jar.classifier = 'only'
+// shadowJar will act like the real jar for inclusion by applications
 shadowJar {
-  baseName = 'snappydata-jdbc_' + scalaBinaryVersion
   classifier = null
 
   // avoid conflict with the 0.9.2 version in stock Spark
@@ -107,6 +104,12 @@ shadowJar {
   }
 }
 
+if (rootProject.hasProperty('enablePublish')) {
+  artifacts {
+    archives packageScalaDocs, packageSources, shadowJar
+  }
+}
+
 // write the POM for spark-package
 String sparkPackageName = "snappydata-jdbc-${version}-s_${scalaBinaryVersion}"