diff --git a/src/main/groovy/org/labkey/gradle/plugin/TeamCity.groovy b/src/main/groovy/org/labkey/gradle/plugin/TeamCity.groovy index 451d9ec8..b3537136 100644 --- a/src/main/groovy/org/labkey/gradle/plugin/TeamCity.groovy +++ b/src/main/groovy/org/labkey/gradle/plugin/TeamCity.groovy @@ -66,11 +66,7 @@ class TeamCity extends Tomcat // from TeamCity's configuration when creating the UITestExtension on TeamCity super.apply(project) project.tomcat.assertionFlag = "-ea" - String truststoreFile = "${project.tomcat.catalinaHome}/localhost.truststore" - if (!project.file(truststoreFile).exists()) - { - truststoreFile = "${System.getProperty("user.home")}/localhost.truststore" - } + truststoreFile = "${System.getProperty("user.home")}/localhost.truststore" if (project.file(truststoreFile).exists()) { project.tomcat.trustStore = "-Djavax.net.ssl.trustStore=${truststoreFile}" diff --git a/src/main/groovy/org/labkey/gradle/plugin/TestRunner.groovy b/src/main/groovy/org/labkey/gradle/plugin/TestRunner.groovy index 4e5b7a9e..61b9821c 100644 --- a/src/main/groovy/org/labkey/gradle/plugin/TestRunner.groovy +++ b/src/main/groovy/org/labkey/gradle/plugin/TestRunner.groovy @@ -17,8 +17,6 @@ package org.labkey.gradle.plugin import org.gradle.api.Project import org.gradle.api.Task -import org.gradle.api.tasks.TaskProvider -import org.gradle.api.tasks.bundling.Zip import org.labkey.gradle.plugin.extension.TeamCityExtension import org.labkey.gradle.task.RunTestSuite import org.labkey.gradle.util.BuildUtils @@ -35,8 +33,6 @@ class TestRunner extends UiTest addDataFileTasks(project) - addExtensionsTasks(project) - addTestSuiteTask(project) addAspectJ(project) @@ -164,36 +160,6 @@ class TestRunner extends UiTest } } - private static void addExtensionsTasks(Project project) - { - File extensionsDir = project.file("chromeextensions") - if (extensionsDir.exists()) - { - List extensionsZipTasks = new ArrayList<>() - extensionsDir.eachDir({ - File dir -> - - String extensionTaskName = "package" + dir.getName().capitalize() - project.tasks.register(extensionTaskName, Zip) { - Zip task -> - task.description = "Package the ${dir.getName()} chrome extension used for testing" - task.archiveBaseName.set(dir.getName()) - task.archiveExtension.set("zip") - task.from dir - task.destinationDirectory.set(project.layout.buildDirectory.dir("chromextensions")) - } - - extensionsZipTasks.add(project.tasks.named(extensionTaskName)) - }) - project.tasks.register("packageChromeExtensions") { - Task task -> - task.description = "Package all chrome extensions used for testing" - task.dependsOn (extensionsZipTasks) - } - - } - } - private void addTestSuiteTask(Project project) { project.logger.debug("TestRunner: addTestSuiteTask for ${project.path}") diff --git a/src/main/groovy/org/labkey/gradle/plugin/extension/TomcatExtension.groovy b/src/main/groovy/org/labkey/gradle/plugin/extension/TomcatExtension.groovy index c4c2714f..c68398af 100644 --- a/src/main/groovy/org/labkey/gradle/plugin/extension/TomcatExtension.groovy +++ b/src/main/groovy/org/labkey/gradle/plugin/extension/TomcatExtension.groovy @@ -21,8 +21,6 @@ class TomcatExtension { private final Project project - String catalinaHome - String tomcatConfDir String assertionFlag = "-ea" // set to -da to disable assertions and -ea to enable assertions String maxMemory = "2G" boolean disableRecompileJsp = false @@ -35,49 +33,5 @@ class TomcatExtension TomcatExtension(Project project) { this.project = project - setCatalinaDirs(project) - } - - String getCatalinaHome() - { - return catalinaHome - } - - String getTomcatConfDir() - { - return tomcatConfDir - } - - private void setCatalinaDirs(Project project) - { - if (System.getenv("CATALINA_HOME") != null) - { - this.catalinaHome = System.getenv("CATALINA_HOME") - } - else if (project.hasProperty("tomcatDir")) - { - this.catalinaHome = project.tomcatDir - } - else if (project.ext.hasProperty("tomcatDir")) - { - this.catalinaHome = project.ext.tomcatDir - } - else - { - this.catalinaHome = TeamCityExtension.getTeamCityProperty(project, "tomcat.home", null) - } - - if (project.ext.hasProperty("tomcatConfDir")) - { - this.tomcatConfDir = project.ext.tomcatConfDir - } - else if (this.catalinaHome != null) - { - this.tomcatConfDir = "${this.catalinaHome}/conf/Catalina/localhost" - } - else - { - this.tomcatConfDir = null - } } } diff --git a/src/main/groovy/org/labkey/gradle/task/DoThenSetup.groovy b/src/main/groovy/org/labkey/gradle/task/DoThenSetup.groovy index d3a4003a..59a8ce45 100644 --- a/src/main/groovy/org/labkey/gradle/task/DoThenSetup.groovy +++ b/src/main/groovy/org/labkey/gradle/task/DoThenSetup.groovy @@ -16,7 +16,6 @@ package org.labkey.gradle.task import org.gradle.api.DefaultTask -import org.gradle.api.GradleException import org.gradle.api.Project import org.gradle.api.file.CopySpec import org.gradle.api.file.DuplicatesStrategy @@ -141,30 +140,6 @@ class DoThenSetup extends DefaultTask return extraJdbcProperties } - - // labkeyXml is up to date if it was created after the current config file was created - // and it has the current appDocBase - boolean labkeyXmlUpToDate(String appDocBase) - { - if (this.dbPropertiesChanged) - return false - - File dbPropFile = DatabaseProperties.getPickedConfigFile(project) - File tomcatLabkeyXml = new File("${project.tomcat.tomcatConfDir}", "labkey.xml") - if (!dbPropFile.exists() || !tomcatLabkeyXml.exists()) - return false - if (dbPropFile.lastModified() < tomcatLabkeyXml.lastModified()) - { - // make sure we haven't switch contexts - for (String line: tomcatLabkeyXml.readLines()) - { - if (line.contains("docBase=\"" + appDocBase + "\"")) - return true - } - } - return false - } - boolean embeddedConfigUpToDate() { if (this.dbPropertiesChanged) diff --git a/src/main/groovy/org/labkey/gradle/task/RunTestSuite.groovy b/src/main/groovy/org/labkey/gradle/task/RunTestSuite.groovy index fe81a79e..9d259663 100644 --- a/src/main/groovy/org/labkey/gradle/task/RunTestSuite.groovy +++ b/src/main/groovy/org/labkey/gradle/task/RunTestSuite.groovy @@ -16,13 +16,10 @@ package org.labkey.gradle.task import org.apache.commons.lang3.StringUtils -import org.gradle.api.file.CopySpec -import org.gradle.api.file.DuplicatesStrategy import org.gradle.api.tasks.Internal import org.labkey.gradle.plugin.TeamCity import org.labkey.gradle.plugin.extension.TeamCityExtension import org.labkey.gradle.util.DatabaseProperties -import org.labkey.gradle.util.TaskUtils /** * Class that sets our test/Runner.class as the junit test suite and configures a bunch of system properties for @@ -44,26 +41,10 @@ abstract class RunTestSuite extends RunUiTest dependsOn(project.tasks.writeSampleDataFile) dependsOn(project.tasks.ensurePassword) - if (project.findProject(":tools:Rpackages:install") != null) - dependsOn(project.project(':tools:Rpackages:install')) - if (!project.getPlugins().hasPlugin(TeamCity.class)) { - TaskUtils.addOptionalTaskDependency(project, this, 'packageChromeExtensions') - } if (project.getPlugins().hasPlugin(TeamCity.class)) { dependsOn(project.tasks.killChrome) - dependsOn(project.tasks.ensurePassword) - - if (project.tomcat.catalinaHome != null) - { - doLast( { - project.copy({ CopySpec copy -> - copy.from "${project.tomcat.catalinaHome}/logs" - copy.into project.layout.buildDirectory.file("logs/test/tomcat") - copy.setDuplicatesStrategy(DuplicatesStrategy.INCLUDE) - }) - }) - } + dependsOn(project.tasks.killFirefox) } } @@ -80,7 +61,6 @@ abstract class RunTestSuite extends RunUiTest systemProperty "testRecentlyFailed", "${runRiskGroupTestsFirst.contains("recentlyFailed")}" } systemProperty "teamcity.buildType.id", project.teamcity['teamcity.buildType.id'] - systemProperty "tomcat.home", System.getenv("CATALINA_HOME") systemProperty "tomcat.port", project.teamcity["tomcat.port"] systemProperty "tomcat.debug", project.teamcity["tomcat.debug"] systemProperty "labkey.port", project.teamcity['tomcat.port'] diff --git a/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy b/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy index fd496f63..93f2cf82 100644 --- a/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy +++ b/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy @@ -30,7 +30,6 @@ import org.labkey.gradle.plugin.extension.LabKeyExtension import org.labkey.gradle.plugin.extension.ModuleExtension import org.labkey.gradle.plugin.extension.ServerDeployExtension import org.labkey.gradle.plugin.extension.TeamCityExtension -import org.labkey.gradle.task.ModuleDistribution import java.nio.charset.StandardCharsets import java.nio.file.Files @@ -546,7 +545,7 @@ class BuildUtils 'tomcat-jsp-api', 'tomcat-util', 'tomcat-websocket-api', - 'tomcat7-websocket' + 'tomcat-websocket' ] static String getGitUrl(Project project) @@ -569,10 +568,7 @@ class BuildUtils static void addTomcatBuildDependencies(Project project, String configuration) { - List tomcatLibs = new ArrayList<>(TOMCAT_LIBS) // Don't modify list - if (!"${project.apacheTomcatVersion}".startsWith("7.")) - tomcatLibs.replaceAll({it.replace('tomcat7-', 'tomcat-')}) - for (String lib : tomcatLibs) + for (String lib : TOMCAT_LIBS) project.dependencies.add(configuration, "org.apache.tomcat:${lib}:${project.apacheTomcatVersion}") }