Skip to content

Stop supporting SMTP startup properties #7923

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-adam wants to merge 5 commits into
base: release26.7-SNAPSHOT
Choose a base branch
from
+20 −21
Open

Stop supporting SMTP startup properties #7923

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7426a16
Stop supporting SMTP startup properties
labkey-adam Aug 10, 2026
dd7500d
Throw only if startup properties exist
labkey-adam Aug 10, 2026
a265653
Correct version
labkey-adam Aug 10, 2026
93b3684
Fail startup if SMTP startup properties are present
labkey-adam Aug 10, 2026
f5f5463
typo
labkey-adam Aug 10, 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
41 changes: 20 additions & 21 deletions api/src/org/labkey/api/util/SmtpTransportProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public String getPropertyName()
@Override
public String getDescription()
{
return "One property for each JavaMail SMTP setting, documented here: https://javaee.github.io/javamail/docs/api/com/sun/mail/smtp/package-summary.html";
return "No longer supported. Configure SMTP settings in application.properties.";
}
}

Expand All @@ -69,31 +69,30 @@ public String getName()
@Override
public void loadConfiguration()
{
try
{
// Load from startup properties group "mail_smtp"
ModuleLoader.getInstance().handleStartupProperties(
new LenientStartupPropertyHandler<>("mail_smtp", new SmtpStartupProperty())
// TODO: Startup failure if SMTP startup properties are present, for now. Remove in 26.11.
ModuleLoader.getInstance().handleStartupProperties(
new LenientStartupPropertyHandler<>("mail_smtp", new SmtpStartupProperty())
{
@Override
public void handle(Collection<StartupPropertyEntry> entries)
{
@Override
public void handle(Collection<StartupPropertyEntry> entries)
if (!entries.isEmpty())
{
entries.forEach(entry ->
_properties.put("mail.smtp." + entry.getName(), entry.getValue()));
throw new ConfigurationException("Configuring SMTP via startup properties is no longer supported. Use application.properties.");
}
});
}
});

// Fallback: check ServletContext for SMTP settings
if (_properties.isEmpty())
try
{
// Load SMTP settings from ServletContext (populated from application.properties)
ServletContext context = ModuleLoader.getServletContext();
Enumeration<String> names = Objects.requireNonNull(context).getInitParameterNames();
while (names.hasMoreElements())
{
ServletContext context = ModuleLoader.getServletContext();
Enumeration<String> names = Objects.requireNonNull(context).getInitParameterNames();
while (names.hasMoreElements())
{
String name = names.nextElement();
if (name.startsWith("mail.smtp."))
_properties.put(name, context.getInitParameter(name));
}
String name = names.nextElement();
if (name.startsWith("mail.smtp."))
_properties.put(name, context.getInitParameter(name));
}

// Create session if configured
Expand Down