dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update gradle-maven-plugin version. Improve packaging scripts

Browse Source
This commit is contained in:
Igor Kulikov 2021-09-08 15:10:31 +03:00
parent b173e0799c
commit 99c927e303
3 changed files with 5 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packaging/java/build.gradle
View File

@ -15,20 +15,10 @@
*/ */
import org.apache.tools.ant.filters.ReplaceTokens import org.apache.tools.ant.filters.ReplaceTokens
buildscript { plugins {
ext { id "nebula.ospackage" version "8.6.3"
osPackageVersion = "8.6.3"
}
repositories {
jcenter()
}
dependencies {
classpath("com.netflix.nebula:gradle-ospackage-plugin:${osPackageVersion}")
}
} }
apply plugin: "nebula.ospackage"
buildDir = projectBuildDir buildDir = projectBuildDir
version = projectVersion version = projectVersion
distsDirName = "./" distsDirName = "./"
@ -177,23 +167,3 @@ buildDeb {
link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml") link("${pkgInstallFolder}/bin/${pkgName}.yml", "${pkgInstallFolder}/conf/${pkgName}.yml")
link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf") 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"
}
}
}

34
packaging/js/build.gradle
View File

@ -15,20 +15,10 @@
*/ */
import org.apache.tools.ant.filters.ReplaceTokens import org.apache.tools.ant.filters.ReplaceTokens
buildscript { plugins {
ext { id "nebula.ospackage" version "8.6.3"
osPackageVersion = "8.6.3"
}
repositories {
jcenter()
}
dependencies {
classpath("com.netflix.nebula:gradle-ospackage-plugin:${osPackageVersion}")
}
} }
apply plugin: "nebula.ospackage"
buildDir = projectBuildDir buildDir = projectBuildDir
version = projectVersion version = projectVersion
distsDirName = "./" distsDirName = "./"
@ -136,23 +126,3 @@ buildDeb {
link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf") 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"
}
}
}

4
pom.xml
View File

@ -510,8 +510,6 @@
<task>build</task> <task>build</task>
<task>buildDeb</task> <task>buildDeb</task>
<task>buildRpm</task> <task>buildRpm</task>
<task>renameDeb</task>
<task>renameRpm</task>
</tasks> </tasks>
<args> <args>
<arg>-PpackagingDir=${main.dir}/packaging</arg> <arg>-PpackagingDir=${main.dir}/packaging</arg>
@ -642,7 +640,7 @@
<plugin> <plugin>
<groupId>org.thingsboard</groupId> <groupId>org.thingsboard</groupId>
<artifactId>gradle-maven-plugin</artifactId> <artifactId>gradle-maven-plugin</artifactId>
<version>1.0.10</version> <version>1.0.11</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.github.eirslett</groupId> <groupId>com.github.eirslett</groupId>