Commit 99c927e3035966908ecbbd7cef08c0bbcd727d03
1 parent
b173e079
Update gradle-maven-plugin version. Improve packaging scripts
Showing
3 changed files
with
5 additions
and
67 deletions
| @@ -15,20 +15,10 @@ | @@ -15,20 +15,10 @@ | ||
| 15 | */ | 15 | */ |
| 16 | import org.apache.tools.ant.filters.ReplaceTokens | 16 | import org.apache.tools.ant.filters.ReplaceTokens |
| 17 | 17 | ||
| 18 | -buildscript { | ||
| 19 | - ext { | ||
| 20 | - osPackageVersion = "8.6.3" | ||
| 21 | - } | ||
| 22 | - repositories { | ||
| 23 | - jcenter() | ||
| 24 | - } | ||
| 25 | - dependencies { | ||
| 26 | - classpath("com.netflix.nebula:gradle-ospackage-plugin:${osPackageVersion}") | ||
| 27 | - } | 18 | +plugins { |
| 19 | + id "nebula.ospackage" version "8.6.3" | ||
| 28 | } | 20 | } |
| 29 | 21 | ||
| 30 | -apply plugin: "nebula.ospackage" | ||
| 31 | - | ||
| 32 | buildDir = projectBuildDir | 22 | buildDir = projectBuildDir |
| 33 | version = projectVersion | 23 | version = projectVersion |
| 34 | distsDirName = "./" | 24 | distsDirName = "./" |
| @@ -177,23 +167,3 @@ buildDeb { | @@ -177,23 +167,3 @@ buildDeb { | ||
| 177 | link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml") | 167 | link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml") |
| 178 | link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf") | 168 | link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf") |
| 179 | } | 169 | } |
| 180 | - | ||
| 181 | -task renameDeb(type: Copy) { | ||
| 182 | - from("${buildDir}/") { | ||
| 183 | - include '*.deb' | ||
| 184 | - destinationDir file("${buildDir}/") | ||
| 185 | - rename { String filename -> | ||
| 186 | - "${pkgName}.deb" | ||
| 187 | - } | ||
| 188 | - } | ||
| 189 | -} | ||
| 190 | - | ||
| 191 | -task renameRpm(type: Copy) { | ||
| 192 | - from("${buildDir}/") { | ||
| 193 | - include '*.rpm' | ||
| 194 | - destinationDir file("${buildDir}/") | ||
| 195 | - rename { String filename -> | ||
| 196 | - "${pkgName}.rpm" | ||
| 197 | - } | ||
| 198 | - } | ||
| 199 | -} |
| @@ -15,20 +15,10 @@ | @@ -15,20 +15,10 @@ | ||
| 15 | */ | 15 | */ |
| 16 | import org.apache.tools.ant.filters.ReplaceTokens | 16 | import org.apache.tools.ant.filters.ReplaceTokens |
| 17 | 17 | ||
| 18 | -buildscript { | ||
| 19 | - ext { | ||
| 20 | - osPackageVersion = "8.6.3" | ||
| 21 | - } | ||
| 22 | - repositories { | ||
| 23 | - jcenter() | ||
| 24 | - } | ||
| 25 | - dependencies { | ||
| 26 | - classpath("com.netflix.nebula:gradle-ospackage-plugin:${osPackageVersion}") | ||
| 27 | - } | 18 | +plugins { |
| 19 | + id "nebula.ospackage" version "8.6.3" | ||
| 28 | } | 20 | } |
| 29 | 21 | ||
| 30 | -apply plugin: "nebula.ospackage" | ||
| 31 | - | ||
| 32 | buildDir = projectBuildDir | 22 | buildDir = projectBuildDir |
| 33 | version = projectVersion | 23 | version = projectVersion |
| 34 | distsDirName = "./" | 24 | distsDirName = "./" |
| @@ -136,23 +126,3 @@ buildDeb { | @@ -136,23 +126,3 @@ buildDeb { | ||
| 136 | 126 | ||
| 137 | link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf") | 127 | link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf") |
| 138 | } | 128 | } |
| 139 | - | ||
| 140 | -task renameDeb(type: Copy) { | ||
| 141 | - from("${buildDir}/") { | ||
| 142 | - include '*.deb' | ||
| 143 | - destinationDir file("${buildDir}/") | ||
| 144 | - rename { String filename -> | ||
| 145 | - "${pkgName}.deb" | ||
| 146 | - } | ||
| 147 | - } | ||
| 148 | -} | ||
| 149 | - | ||
| 150 | -task renameRpm(type: Copy) { | ||
| 151 | - from("${buildDir}/") { | ||
| 152 | - include '*.rpm' | ||
| 153 | - destinationDir file("${buildDir}/") | ||
| 154 | - rename { String filename -> | ||
| 155 | - "${pkgName}.rpm" | ||
| 156 | - } | ||
| 157 | - } | ||
| 158 | -} |
| @@ -510,8 +510,6 @@ | @@ -510,8 +510,6 @@ | ||
| 510 | <task>build</task> | 510 | <task>build</task> |
| 511 | <task>buildDeb</task> | 511 | <task>buildDeb</task> |
| 512 | <task>buildRpm</task> | 512 | <task>buildRpm</task> |
| 513 | - <task>renameDeb</task> | ||
| 514 | - <task>renameRpm</task> | ||
| 515 | </tasks> | 513 | </tasks> |
| 516 | <args> | 514 | <args> |
| 517 | <arg>-PpackagingDir=${main.dir}/packaging</arg> | 515 | <arg>-PpackagingDir=${main.dir}/packaging</arg> |
| @@ -642,7 +640,7 @@ | @@ -642,7 +640,7 @@ | ||
| 642 | <plugin> | 640 | <plugin> |
| 643 | <groupId>org.thingsboard</groupId> | 641 | <groupId>org.thingsboard</groupId> |
| 644 | <artifactId>gradle-maven-plugin</artifactId> | 642 | <artifactId>gradle-maven-plugin</artifactId> |
| 645 | - <version>1.0.10</version> | 643 | + <version>1.0.11</version> |
| 646 | </plugin> | 644 | </plugin> |
| 647 | <plugin> | 645 | <plugin> |
| 648 | <groupId>com.github.eirslett</groupId> | 646 | <groupId>com.github.eirslett</groupId> |