Commit 126d0fc3 authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

Merge branch 'v4.1-dev' into 'v4.x-master'

V4.1 dev

See merge request !20
parents ffaea77f a79cf0f1
Pipeline #23438 failed with stages
in 3 minutes
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
......@@ -38,35 +38,6 @@ dependencies {
testCompileOnly "org.projectlombok:lombok"
developmentOnly "org.springframework.boot:spring-boot-devtools"
// =======================
// Old ... remove
// =======================
//compile "org.springframework:spring-context:$springVersion"
//compile "org.springframework:spring-beans:$springVersion"
//compile "org.springframework:spring-core:$springVersion"
//compile "org.springframework:spring-webmvc:$springVersion"
//compile "org.springframework:spring-web:$springVersion"
//compile "org.springframework.security:spring-security-core:4.2.1.RELEASE"
//compile "org.springframework.security:spring-security-web:4.2.1.RELEASE"
//compile "org.springframework.security:spring-security-config:4.2.1.RELEASE"
//compile "org.apache.httpcomponents:httpclient:$httpComponentsVersion"
//compile "org.apache.tiles:tiles-core:$tilesVersion"
//compile "org.apache.tiles:tiles-jsp:$tilesVersion"
//compile "org.apache.tiles:tiles-api:$tilesVersion"
/* compile "org.slf4j:slf4j-api:$slf4jVersion"
compile "ch.qos.logback:logback-core:$logbackVersion"
compile "ch.qos.logback:logback-classic:$logbackVersion"
compile "javax.servlet:jstl:1.2"
compile "org.yaml:snakeyaml:1.18"
runtime "org.slf4j:jcl-over-slf4j:$slf4jVersion"
runtime "org.slf4j:log4j-over-slf4j:$slf4jVersion"
runtime "org.apache.logging.log4j:log4j-to-slf4j:2.7"
testImplementation "org.springframework:spring-test:$springVersion"
testImplementation "junit:junit:4.12"
testImplementation "org.mockito:mockito-all:1.10.19"
providedCompile "javax.servlet:servlet-api:2.5"
providedCompile "javax.servlet.jsp:jsp-api:2.1"*/
}
bootWar {
......@@ -104,6 +75,7 @@ ospackage {
from("src/main/resources/application.deb.yml") {
into "/etc/dfa/search"
fileType = CONFIG | NOREPLACE
rename { String filename ->
filename.replace("application.deb.yml", "search.yml")
}
......@@ -141,9 +113,10 @@ task publishDebPackage {
dependsOn buildDeb
def distroPath = "$buildDir/distributions/"
doLast {
println "VERSON $version"
if (version.endsWith('SNAPSHOT') || version.endsWith('RELEASE')) {
aptRepo = version.endsWith('SNAPSHOT') ? aptTestingRepo : aptReleasesRepo
println "Publishing Debian package $debFile as user $repoUser to $aptRepo";
println "Publishing Debian package $debFile as user $repoUser to $aptRepo"
exec {
executable "curl"
args "-f", "-u", "$repoUser:$repoPass", "-H", "Content-Type: multipart/form-data", "--data-binary", "@$distroPath$debFile", "$aptRepo";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment