From 6d592174efb7abad63756a18caaac5f341b96b3a Mon Sep 17 00:00:00 2001 From: Susan Hert Date: Thu, 30 Nov 2023 12:12:21 -0800 Subject: [PATCH 1/2] CVE-2023-46589: Update tomcat version (#167) --- standalone/gradle.properties | 2 +- standalone/noPlugins_build.gradle | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/standalone/gradle.properties b/standalone/gradle.properties index bea643b..369ab03 100644 --- a/standalone/gradle.properties +++ b/standalone/gradle.properties @@ -10,7 +10,7 @@ gradlePluginsVersion=1.42.1 labkeyClientApiVersion=5.3.0 # used by the LabKey Jsp Gradle plugin for declaring dependencies -apacheTomcatVersion=9.0.82 +apacheTomcatVersion=9.0.83 servletApiVersion=4.0.1 # Example external dependency used in build file diff --git a/standalone/noPlugins_build.gradle b/standalone/noPlugins_build.gradle index 224978a..13c8482 100644 --- a/standalone/noPlugins_build.gradle +++ b/standalone/noPlugins_build.gradle @@ -32,7 +32,7 @@ project.version="0.0.1-SNAPSHOT" ext { // The following are convenience variables for the various output directories used below - explodedModuleDir = "${project.buildDir}/explodedModule" + explodedModuleDir = project.layout.buildDirectory.file("explodedModule").get().asFile.path libDir = "${explodedModuleDir}/lib" configDir = "${explodedModuleDir}/config" } @@ -103,14 +103,14 @@ project.tasks.register("apiJar", Jar) { jar.description = "produce jar file for api" jar.from project.sourceSets.api.output jar.archiveBaseName.set("${project.name}_api") - jar.destinationDirectory = project.file(libDir) + jar.destinationDirectory.set(project.file(libDir)) jar.dependsOn(project.apiClasses) } project.jar { Jar jar -> jar.archiveBaseName.set(project.name) - jar.destinationDirectory = project.file(libDir) + jar.destinationDirectory.set(project.file(libDir)) jar.dependsOn(project.tasks.apiJar) } @@ -171,7 +171,7 @@ project.tasks.register("module", Jar) { jar.from explodedModuleDir jar.archiveBaseName.set(project.name) jar.archiveExtension.set('module') - jar.destinationDirectory = project.buildDir + jar.destinationDirectory.set(project.layout.buildDirectory) jar.dependsOn(project.tasks.moduleXml) jar.dependsOn(project.tasks.processModuleResources) jar.dependsOn(project.tasks.copyExternalLibs) From 4f209493e6f390ca4582a3c45a0389916fafc31b Mon Sep 17 00:00:00 2001 From: Susan Hert Date: Thu, 30 Nov 2023 12:12:44 -0800 Subject: [PATCH 2/2] CVE-2023-46589: upgrade tomcat version to 9.0.83 (#166) --- standalone/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standalone/gradle.properties b/standalone/gradle.properties index bea643b..369ab03 100644 --- a/standalone/gradle.properties +++ b/standalone/gradle.properties @@ -10,7 +10,7 @@ gradlePluginsVersion=1.42.1 labkeyClientApiVersion=5.3.0 # used by the LabKey Jsp Gradle plugin for declaring dependencies -apacheTomcatVersion=9.0.82 +apacheTomcatVersion=9.0.83 servletApiVersion=4.0.1 # Example external dependency used in build file