Merge branch 'master' into sdk-6065-tenant-acl-autho-java-support-ga

Author: tanya732

gradle/maven-publish.gradle

@@ -28,15 +28,15 @@ artifacts {
 publishing {
   publications {
     mavenJava(MavenPublication) {
+      from components.java
+
+      artifact sourcesJar
+      artifact javadocJar
 
       groupId = GROUP
       artifactId = POM_ARTIFACT_ID
       version = getVersionName()
 
-      artifact("$buildDir/libs/${project.name}-${version}.jar")
-      artifact sourcesJar
-      artifact javadocJar
-
       pom {
         name = POM_NAME
         packaging = POM_PACKAGING