Skip to content

Remove versions for GWT and Jakarta annotations #1368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
labkey-jeckels wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Remove versions for GWT and Jakarta annotations #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97a6ddb
Remove versions for GWT and Jakarta annotations
labkey-jeckels May 8, 2026
abd9fa1
Remove GWT references
labkey-jeckels May 8, 2026
d9a6716
Remove GWT references
labkey-jeckels May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ allprojects {
analyzers.ossIndex.enabled = false
}
formats = ['HTML', 'JUNIT']
skipConfigurations = ['dedupe', 'gwtCompileClasspath', 'gwtRuntimeClasspath', 'developmentOnly']
skipConfigurations = ['dedupe', 'developmentOnly']
Copy link
Copy Markdown
Contributor Author

@labkey-jeckels labkey-jeckels May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@labkey-susanh let me know if this should remain until the Gradle plugin updates.

skipProjects = [':server:testAutomation']

nvd {
Expand Down
5 changes: 0 additions & 5 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions server/bootstrap/src/org/labkey/bootstrap/ExplodedModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -139,8 +138,6 @@ public Set<File> deployToWebApp(File webAppDirectory) throws IOException
Set<File> 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);

Expand Down
Loading