Skip to content

Commit

Permalink
Merge pull request #561 from uPortal-Project/feat/tomcat-config-task
Browse files Browse the repository at this point in the history
feat: separate out tomcatConfig task from tomcatInstall
  • Loading branch information
bjagg authored Mar 25, 2022
2 parents 173146a + dc3c459 commit 1587fa4
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions gradle/tasks/tomcat.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ task tomcatInstall() {
group 'Tomcat'
description 'Downloads the Apache Tomcat servlet container and performs the necessary configuration steps'
dependsOn ':portalProperties'
finalizedBy 'tomcatConfig'

doLast {
String serverHome = rootProject.ext['buildProperties'].getProperty('server.home')
Expand Down Expand Up @@ -69,6 +70,16 @@ task tomcatInstall() {
from "${tomcatTmpDir}/apache-tomcat-${tomcatVersion}"
into serverHome
}
}
}

task tomcatConfig() {
group 'Tomcat'
description 'Configures Tomcat servlet container, used to update an existing Tomcat install'
dependsOn ':portalProperties'

doLast {
String serverHome = rootProject.ext['buildProperties'].getProperty('server.home')

// Configure our settings by overlaying etc/tomcat
copy {
Expand Down

0 comments on commit 1587fa4

Please sign in to comment.