Skip to content
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

Jump to bottom

[WFLY-19090][WFLY-19091][WFLY-19092][WFLY-19093][WFLY-19094] Upgrade Jakarta Activation, Jakarta Mail and Angus implementations #17685

Merged
merged 6 commits into from
Mar 15, 2024
Merged

[WFLY-19090][WFLY-19091][WFLY-19092][WFLY-19093][WFLY-19094] Upgrade Jakarta Activation, Jakarta Mail and Angus implementations #17685

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
1806c54
[WFLY-19090] Upgrade Jakarta Activation from 2.1.2 to 2.1.3
yersan Mar 4, 2024
de19482
[WFLY-19091] Upgrade Angus Activation from 2.0.1 to 2.0.2
yersan Mar 4, 2024
fa5a5d1
[WFLY-19092] Upgrade Jakarta Mail from 2.1.2 to 2.1.3
yersan Mar 4, 2024
69e8d7c
[WFLY-19093] Jakarta Mail no longer need to find implementations on t…
yersan Mar 4, 2024
08c1d5d
[WFLY-19094] Upgrade Angus Mail to from 2.0.2 to 2.0.3
yersan Mar 4, 2024
21c84d3
Merge branch 'main' into WFLY-19090-WFLY-19091-WFLY-19092-WFLY-19093-…
bstansberry Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 0 additions & 9 deletions ...-shared/src/main/resources/modules/system/layers/base/org/jboss/as/naming/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,6 @@
<!-- Use only by RemoteNamingResourceDefinition resource -->
<module name="org.jboss.remoting" optional="true"/>
<module name="org.jboss.threads"/>
<!--
The Angus Mail services are required to be able to load the Jakarta Mail Session from this Module context classloader
when listing the Mail context stored in the JNDI tree.
-->
<module name="org.eclipse.angus.mail" services="import" optional="true">
<imports>
<include path="META-INF"/>
</imports>
</module>
</dependencies>

</module>
15 changes: 1 addition & 14 deletions mail/src/main/java/org/jboss/as/mail/extension/SessionProviderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import jakarta.mail.Authenticator;
import jakarta.mail.PasswordAuthentication;
import jakarta.mail.Session;
import org.wildfly.security.manager.WildFlySecurityManager;

/**
* @author <a href="mailto:tomaz.cerar@redhat.com">Tomaz Cerar</a> (c) 2013 Red Hat Inc.
Expand Down Expand Up @@ -149,19 +148,7 @@ private InetSocketAddress getServerSocketAddress(ServerConfig server) throws Sta

@Override
public Session getSession() {
final Session session;
final ClassLoader current = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged();
if (current == null) {
try {
WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(Session.class.getClassLoader());
session = Session.getInstance(properties, new ManagedPasswordAuthenticator(sessionConfig));
} finally {
WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(current);
}
} else {
session = Session.getInstance(properties, new ManagedPasswordAuthenticator(sessionConfig));
}
return session;
return Session.getInstance(properties, new ManagedPasswordAuthenticator(sessionConfig));
}
}

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@
<version.io.undertow.jastow>2.2.7.Final</version.io.undertow.jastow>
<version.io.vertx.vertx>4.5.3</version.io.vertx.vertx>
<version.io.vertx.vertx-kafka-client>4.4.8</version.io.vertx.vertx-kafka-client>
<version.jakarta.activation.jakarta.activation-api>2.1.2</version.jakarta.activation.jakarta.activation-api>
<version.jakarta.activation.jakarta.activation-api>2.1.3</version.jakarta.activation.jakarta.activation-api>
<version.jakarta.annotation.jakarta-annotation-api>2.1.1</version.jakarta.annotation.jakarta-annotation-api>
<version.jakarta.batch.jakarta.batch-api>2.1.1</version.jakarta.batch.jakarta.batch-api>
<version.jakarta.ejb.jakarta-ejb-api>4.0.1</version.jakarta.ejb.jakarta-ejb-api>
Expand All @@ -431,7 +431,7 @@
<version.jakarta.inject.jakarta.inject-api>2.0.1</version.jakarta.inject.jakarta.inject-api>
<version.jakarta.jms.jakarta-jms-api>3.1.0</version.jakarta.jms.jakarta-jms-api>
<version.jakarta.json.bind.api>3.0.0</version.jakarta.json.bind.api>
<version.jakarta.mail-api>2.1.2</version.jakarta.mail-api>
<version.jakarta.mail-api>2.1.3</version.jakarta.mail-api>
<version.jakarta.persistence>3.1.0</version.jakarta.persistence>
<version.jakarta.resource.jakarta-resource-api>2.1.0</version.jakarta.resource.jakarta-resource-api>
<version.jakarta.security.enterprise>3.0.0</version.jakarta.security.enterprise>
Expand Down Expand Up @@ -467,8 +467,8 @@
<version.org.codehaus.woodstox.stax2-api>4.2.2</version.org.codehaus.woodstox.stax2-api>
<version.org.codehaus.woodstox.woodstox-core>6.4.0</version.org.codehaus.woodstox.woodstox-core>
<version.org.cryptacular>1.2.5</version.org.cryptacular>
<version.org.eclipse.angus.angus-activation>2.0.1</version.org.eclipse.angus.angus-activation>
<version.org.eclipse.angus.angus-mail>2.0.2</version.org.eclipse.angus.angus-mail>
<version.org.eclipse.angus.angus-activation>2.0.2</version.org.eclipse.angus.angus-activation>
<version.org.eclipse.angus.angus-mail>2.0.3</version.org.eclipse.angus.angus-mail>
<version.org.eclipse.jdt>3.32.0</version.org.eclipse.jdt>
<version.org.eclipse.microprofile>6.1</version.org.eclipse.microprofile>
<version.org.eclipse.microprofile.config.api>3.1</version.org.eclipse.microprofile.config.api>
Expand Down