From 6aa796619984e8cf516ee99656cd853c8eefac7e Mon Sep 17 00:00:00 2001 From: Trey Chadick Date: Tue, 26 Dec 2023 11:18:43 -0800 Subject: [PATCH] Exclude non-migrated repositories (#656) --- gradle/settings/tomcat10.gradle | 98 +++++---------------------------- 1 file changed, 15 insertions(+), 83 deletions(-) diff --git a/gradle/settings/tomcat10.gradle b/gradle/settings/tomcat10.gradle index 71228ccacf..e050816dde 100644 --- a/gradle/settings/tomcat10.gradle +++ b/gradle/settings/tomcat10.gradle @@ -46,89 +46,21 @@ buildscript { } import org.labkey.gradle.util.BuildUtils -// Add modules here as they are migrated to tomcat 10 -BuildUtils.includeModules(this.settings, rootDir, [ -// "server/modules/BimberLabKeyModules", -// "server/modules/DiscvrLabKeyModules", -// "server/modules/LabDevKitModules", -// "server/modules/MacCossLabModules", - "server/modules/MaxQuant", -// "server/modules/OConnorLabModules", - "server/modules/Response", - "server/modules/UserReg-WS", - "server/modules/accounts", - "server/modules/adjudication", - "server/modules/assayRequest", - "server/modules/assayreport", - "server/modules/biologics", - "server/modules/cas", - "server/modules/cdisc_ODM", - "server/modules/cds", - "server/modules/ciml", - "server/modules/cloud", - "server/modules/cloudServices", - "server/modules/commonAssays", - "server/modules/compliance", - "server/modules/complianceActivities", -// "server/modules/connectors", - "server/modules/customModules", - "server/modules/dataFinder", - "server/modules/dataintegration", - "server/modules/docker", -// "server/modules/ehrModules", - "server/modules/evaluationContent", - "server/modules/fileTransfer", - "server/modules/freezerpro", - "server/modules/harvest", - "server/modules/hjfSampleRequests", - "server/modules/inventory", - "server/modules/itn-tslk-modules", -// "server/modules/johnsHopkinsEHRModules", - "server/modules/kitePharma", - "server/modules/labbook", - "server/modules/ldap", - "server/modules/lygos", - "server/modules/mfa", - "server/modules/moduleEditor", - "server/modules/nci", - "server/modules/neurimmune", - "server/modules/neuroscience-trc", - "server/modules/niaid", - "server/modules/niaidElisa", - "server/modules/nihs", -// "server/modules/nircEHRModules", - "server/modules/nlp", -// "server/modules/onprcEHRModules", - "server/modules/ontology", - "server/modules/openEMPI", - "server/modules/pepdb", - "server/modules/platform", - "server/modules/pnnl", - "server/modules/premium", - "server/modules/professional", - "server/modules/provenance", - "server/modules/puppeteer", - "server/modules/pushdownloads", - "server/modules/reagent", - "server/modules/recipe", - "server/modules/redcap", - "server/modules/redshift", -// "server/modules/rstudio", - "server/modules/saml", - "server/modules/sampleManagement", - "server/modules/serviceTools", - "server/modules/signing", -// "server/modules/snd", -// "server/modules/snprcEHRModules", - "server/modules/targetedms", -// "server/modules/tnprc_billing", -// "server/modules/tnprc_ehr", - "server/modules/trialServices", - "server/modules/trialShare", - "server/modules/tutorialModules", -// "server/modules/wnprc-modules", - "server/modules/workflow", -], [], true) +// Remove modules from this as they are migrated to tomcat 10 +BuildUtils.includeModules(this.settings, rootDir, ["server/modules"], [ + "BimberLabKeyModules", + "DiscvrLabKeyModules", + "LabDevKitModules", + "ehrModules", + "johnsHopkinsEHRModules", + "nircEHRModules", + "onprcEHRModules", + "snd", + "snprcEHRModules", + "tnprc_billing", + "tnprc_ehr", + "wnprc-modules", +], true) // include the test distribution, which is used to create an artifact for TeamCity to pass around to the agents