From 97a6ddb6c95e654a830ff1ee908ea0d3ef35ba66 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Fri, 8 May 2026 15:10:18 -0700 Subject: [PATCH 1/3] Remove versions for GWT and Jakarta annotations --- gradle.properties | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index ee364416cd..f0126be414 100644 --- a/gradle.properties +++ b/gradle.properties @@ -174,10 +174,6 @@ gsonVersion=2.8.9 guavaVersion=33.6.0-jre -# Note: You won't find usages in the product sources; this property is used by the gradle plugin. -gwtVersion=2.13.0 -gwtServletJakartaVersion=2.13.0 - # force hadoop-hdfs-client for CVE-2021-37404, CVE-2022-25168, CVE-2022-26612, CVE-2021-25642, CVE-2021-33036, CVE-2023-26031, hadoopHdfsClientVersion=3.4.1 @@ -322,7 +318,6 @@ tikaVersion=3.3.0 tukaaniXZVersion=1.12 validationApiVersion=1.1.0.Final -validationJakartaApiVersion=3.0.2 # NLP and SAML bring woodstox-core in as a transitive dependency but with very different versions. We force the later version. woodstoxCoreVersion=7.1.1 From abd9fa17dc579e381755a43e5a684c78ac62d6cc Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Fri, 8 May 2026 15:27:07 -0700 Subject: [PATCH 2/3] Remove GWT references --- .../bootstrap/src/org/labkey/bootstrap/ExplodedModule.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/bootstrap/src/org/labkey/bootstrap/ExplodedModule.java b/server/bootstrap/src/org/labkey/bootstrap/ExplodedModule.java index c0a35e160a..c4582e35c4 100644 --- a/server/bootstrap/src/org/labkey/bootstrap/ExplodedModule.java +++ b/server/bootstrap/src/org/labkey/bootstrap/ExplodedModule.java @@ -54,8 +54,7 @@ public class ExplodedModule // With Gradle 1.8, we removed the -jsp classifier at the end of the jar file name, so we need to identify by the string _jsp- in the middle of the jar file name (e.g., announcements_jsp-19.3-SNAPSHOT.jar) private static final FilenameFilter _jspJarFilter = (dir, name) -> name.toLowerCase().contains("_jsp-"); private static final FilenameFilter _springConfigFilter = (dir, name) -> name.toLowerCase().endsWith("context.xml"); - private static final FilenameFilter _moduleXmlFilter = (dir, name) -> name.toLowerCase().equals("module.xml"); - private static final FilenameFilter _gwtFilter = (dir, name) -> name.endsWith(".gwt.rpc"); + private static final FilenameFilter _moduleXmlFilter = (dir, name) -> name.equalsIgnoreCase("module.xml"); private static final FilenameFilter _jarFilter = (dir, name) -> { String lowerName = name.toLowerCase(); @@ -139,8 +138,6 @@ public Set deployToWebApp(File webAppDirectory) throws IOException Set webAppFiles = new HashSet<>(); copyBranch(new File(getRootDirectory(), WEB_CONTENT_PATH + "/WEB-INF"), new File(webAppDirectory, "WEB-INF"), webAppFiles); - // GWTServlet depends on finding its gwt.rpc artifacts in the webapp - copyBranch(new File(getRootDirectory(), WEB_CONTENT_PATH), webAppDirectory, webAppFiles, _gwtFilter); copyFiles(getFiles(CONFIG_PATH, _springConfigFilter), webInfDir, webAppFiles); From d9a6716cd52a4af62b6636e08f0b8a2a8799d9ec Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Fri, 8 May 2026 15:29:25 -0700 Subject: [PATCH 3/3] Remove GWT references --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5f530565bd..896786b2a6 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ allprojects { analyzers.ossIndex.enabled = false } formats = ['HTML', 'JUNIT'] - skipConfigurations = ['dedupe', 'gwtCompileClasspath', 'gwtRuntimeClasspath', 'developmentOnly'] + skipConfigurations = ['dedupe', 'developmentOnly'] skipProjects = [':server:testAutomation'] nvd {