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

Merged
labkey-jeckels merged 6 commits into from
May 11, 2026
Merged

Remove versions for GWT and Jakarta annotations #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 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
b3379bf
Auto-refactor lint cleanup
labkey-jeckels May 9, 2026
c393eeb
Merge remote-tracking branch 'origin/fb_lintCleanup' into fb_gwtDelete
labkey-jeckels May 11, 2026
b672250
Merge branch 'develop' into fb_gwtDelete
labkey-jeckels May 11, 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.

Copy link
Copy Markdown
Contributor

@labkey-susanh labkey-susanh May 11, 2026

Choose a reason for hiding this comment

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

If there are no modules with a directory called gwtsrc then there should be no modules that apply the GWT plugin, and thus none that have these configurations, so I believe it's safe to remove them. There's also, I think, no harm in leaving them and just making a note in the issue that is already open to clean these up when the plugins are updated to remove the GWT plugin.

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
2 changes: 1 addition & 1 deletion server/bootstrap/src/org/labkey/bootstrap/LabKeyBootstrapClassLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ public File getDeletedModulesDirectory()
}
catch (IOException x)
{
_log.info("Could not set hidden attribute on directory: " + deleted.getPath());
_log.info("Could not set hidden attribute on directory: {}", deleted.getPath());
}
}

Expand Down
4 changes: 2 additions & 2 deletions server/bootstrap/src/org/labkey/bootstrap/ModuleArchive.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ private String nameFromModuleXML(InputStream is) throws IOException
@Override
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException
{
String parent = elementStack.isEmpty() ? "" : elementStack.get(elementStack.size()-1);
String parent = elementStack.isEmpty() ? "" : elementStack.getLast();
elementStack.add(qName+"#"+attributes.getValue("id"));
if (qName.equals("property") && "bean#moduleBean".equals(parent))
{
Expand All @@ -99,7 +99,7 @@ public void startElement(String uri, String localName, String qName, Attributes
@Override
public void endElement(String uri, String localName, String qName) throws SAXException
{
elementStack.remove(elementStack.size()-1);
elementStack.removeLast();
}
});

Expand Down
4 changes: 2 additions & 2 deletions server/embedded/src/org/labkey/embedded/LabKeyDeleteAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ private List<PathWithAttributes> selectFilesToDelete(Path basePath, List<PathWit
if (logToRetain != null && !_copiedOriginal && logToRetain.getAttributes().size() > 0)
{
Path target = logToRetain.getPath().getParent().resolve("labkey-errors-" + DATE_FORMAT.format(new Date()) + ".log");
LOGGER.info("Retaining labkey-errors.log file before it gets deleted by rotation. Copying to " + target);
LOGGER.info("Retaining labkey-errors.log file before it gets deleted by rotation. Copying to {}", target);

try
{
Expand All @@ -161,7 +161,7 @@ private List<PathWithAttributes> selectFilesToDelete(Path basePath, List<PathWit
}
catch (IOException e)
{
LOGGER.warn("Failed to retain error log file " + logToRetain.getPath(), e);
LOGGER.warn("Failed to retain error log file {}", logToRetain.getPath(), e);
}
_copiedOriginal = true;
}
Expand Down
4 changes: 2 additions & 2 deletions server/embedded/src/org/labkey/embedded/LabKeySpringBootClassLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public LabKeySpringBootClassLoader(ClassLoader parent)
if (is != null)
{
addURL(url);
LOG.info("Added URL that resolves log4j2.xml to class loader: " + url);
LOG.info("Added URL that resolves log4j2.xml to class loader: {}", url);
}
}
catch (IOException e)
Expand All @@ -65,7 +65,7 @@ public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundExce
ClassLoader parent = getParent();
while (parent != null)
{
LOG.debug("Looking for SessionAppending - checking ClassLoader " + parent);
LOG.debug("Looking for SessionAppending - checking ClassLoader {}", parent);
if (parent.getClass().getName().equals("jdk.internal.loader.ClassLoaders$AppClassLoader") ||
parent.getClass().getName().equals("org.springframework.boot.loader.launch.LaunchedClassLoader"))
{
Expand Down
4 changes: 2 additions & 2 deletions server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,12 +394,12 @@ private String getPropValue(Map<Integer, String> propValues, Integer resourceKey
{
if (propValues == null)
{
LOG.debug(String.format("%1$s property was not provided, using default", propName));
LOG.debug("{} property was not provided, using default", propName);
return defaultValue;
}

if (!propValues.containsKey(resourceKey))
LOG.debug(String.format("%1$s property was not provided for resource [%2$s], using default [%3$s]", propName, resourceKey, defaultValue));
LOG.debug("{} property was not provided for resource [{}], using default [{}]", propName, resourceKey, defaultValue);

String val = propValues.getOrDefault(resourceKey, defaultValue);
return val != null && !val.isBlank() ? val.trim() : defaultValue;
Expand Down