Fix maven plugin imports

Author: tomkoptel

client/build.gradle

@@ -1,11 +1,12 @@
 apply plugin: 'com.android.library'
+apply plugin: 'android-maven'
 
 description = 'js-android-sdk-client'
 
 ext {
     PUBLISH_GROUP_ID = group
     PUBLISH_ARTIFACT_ID = description
-    PUBLISH_VERSION = '1.9.0'
+    PUBLISH_VERSION = '1.9'
 }
 
 android {

client/src/androidTest/AndroidManifest.xml

@@ -28,8 +28,4 @@
 
     <application/>
 
-    <instrumentation
-        android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="com.jaspersoft.android.sdk.integration" />
-
 </manifest>

ui/build.gradle

@@ -1,11 +1,12 @@
 apply plugin: 'com.android.library'
+apply plugin: 'android-maven'
 
 description = 'js-android-sdk-ui'
 
 ext {
     PUBLISH_GROUP_ID = group
     PUBLISH_ARTIFACT_ID = description
-    PUBLISH_VERSION = '1.9.0'
+    PUBLISH_VERSION = '1.9'
 }
 
 
@@ -24,6 +25,19 @@ android {
     lintOptions {
         abortOnError false
     }
+	
+	packagingOptions {
+        exclude 'asm-license.txt'
+        exclude 'NOTICE'
+        exclude 'LICENSE'
+        exclude 'LICENSE.txt'
+        exclude 'META-INF/license.txt'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/notice.txt'
+        exclude 'META-INF/NOTICE.txt'
+        exclude 'META-INF/NOTICE'
+    }
 }