From 99c927e3035966908ecbbd7cef08c0bbcd727d03 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Wed, 8 Sep 2021 15:10:31 +0300
Subject: [PATCH] Update gradle-maven-plugin version. Improve packaging scripts

---
 packaging/java/build.gradle | 34 ++--------------------------------
 packaging/js/build.gradle   | 34 ++--------------------------------
 pom.xml                     |  4 +---
 3 files changed, 5 insertions(+), 67 deletions(-)

diff --git a/packaging/java/build.gradle b/packaging/java/build.gradle
index bd204028bb..5281fded8e 100644
--- a/packaging/java/build.gradle
+++ b/packaging/java/build.gradle
@@ -15,20 +15,10 @@
  */
 import org.apache.tools.ant.filters.ReplaceTokens
 
-buildscript {
-    ext {
-        osPackageVersion = "8.6.3"
-    }
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath("com.netflix.nebula:gradle-ospackage-plugin:${osPackageVersion}")
-    }
+plugins {
+    id "nebula.ospackage" version "8.6.3"
 }
 
-apply plugin: "nebula.ospackage"
-
 buildDir = projectBuildDir
 version = projectVersion
 distsDirName = "./"
@@ -177,23 +167,3 @@ buildDeb {
     link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml")
     link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
 }
-
-task renameDeb(type: Copy) {
-    from("${buildDir}/") {
-        include '*.deb'
-        destinationDir file("${buildDir}/")
-        rename { String filename ->
-            "${pkgName}.deb"
-        }
-    }
-}
-
-task renameRpm(type: Copy) {
-    from("${buildDir}/") {
-        include '*.rpm'
-        destinationDir file("${buildDir}/")
-        rename { String filename ->
-            "${pkgName}.rpm"
-        }
-    }
-}
diff --git a/packaging/js/build.gradle b/packaging/js/build.gradle
index 9d9d52eddf..929b7ed9d7 100644
--- a/packaging/js/build.gradle
+++ b/packaging/js/build.gradle
@@ -15,20 +15,10 @@
  */
 import org.apache.tools.ant.filters.ReplaceTokens
 
-buildscript {
-    ext {
-        osPackageVersion = "8.6.3"
-    }
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath("com.netflix.nebula:gradle-ospackage-plugin:${osPackageVersion}")
-    }
+plugins {
+    id "nebula.ospackage" version "8.6.3"
 }
 
-apply plugin: "nebula.ospackage"
-
 buildDir = projectBuildDir
 version = projectVersion
 distsDirName = "./"
@@ -136,23 +126,3 @@ buildDeb {
 
     link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
 }
-
-task renameDeb(type: Copy) {
-    from("${buildDir}/") {
-        include '*.deb'
-        destinationDir file("${buildDir}/")
-        rename { String filename ->
-            "${pkgName}.deb"
-        }
-    }
-}
-
-task renameRpm(type: Copy) {
-    from("${buildDir}/") {
-        include '*.rpm'
-        destinationDir file("${buildDir}/")
-        rename { String filename ->
-            "${pkgName}.rpm"
-        }
-    }
-}
diff --git a/pom.xml b/pom.xml
index 33588bf756..cbba363b77 100755
--- a/pom.xml
+++ b/pom.xml
@@ -510,8 +510,6 @@
                                     <task>build</task>
                                     <task>buildDeb</task>
                                     <task>buildRpm</task>
-                                    <task>renameDeb</task>
-                                    <task>renameRpm</task>
                                 </tasks>
                                 <args>
                                     <arg>-PpackagingDir=${main.dir}/packaging</arg>
@@ -642,7 +640,7 @@
                 <plugin>
                     <groupId>org.thingsboard</groupId>
                     <artifactId>gradle-maven-plugin</artifactId>
-                    <version>1.0.10</version>
+                    <version>1.0.11</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.eirslett</groupId>