You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/12/25 15:12:24 UTC
(causeway) branch spring6 updated (2760ec0028 -> 78d232a47d)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git
from 2760ec0028 Merge pull request #2130 from apache/dependabot/maven/spring6/org.javassist-javassist-3.30.2-GA
add fc0aca1d53 CAUSEWAY-3664: updates bootstrap override for 3 issues
add d77effdeb8 CAUSEWAY-3664: fixes sidebar 25%
add 080caaaf7c CAUSEWAY-3664: fixes CSS for single selection box also
add 8e4036b5b2 Merge pull request #2116 from apache/CAUSEWAY-3664
add c64ac4c959 CAUSEWAY-3664: fixes CSS for single selection box also (2)
add add7d9f055 Merge pull request #2117 from apache/CAUSEWAY-3664
add 0b23c4399e Bump com.google.errorprone:error_prone_annotations from 2.23.0 to 2.24.0
add 3e3bddc13c Merge pull request #2120 from apache/dependabot/maven/master/com.google.errorprone-error_prone_annotations-2.24.0
add 773e1a2014 Bump asciidoctorj.version from 2.5.10 to 2.5.11
add 11daf4c6ab Merge pull request #2118 from apache/dependabot/maven/master/asciidoctorj.version-2.5.11
add 83f2be8996 Bump io.cucumber:messages from 24.0.0 to 24.0.1
add c7321e07a5 Merge pull request #2119 from apache/dependabot/maven/master/io.cucumber-messages-24.0.1
add 9cf7b74db0 Bump org.javassist:javassist from 3.30.1-GA to 3.30.2-GA
add 5faa021498 Merge pull request #2127 from apache/dependabot/maven/master/org.javassist-javassist-3.30.2-GA
add f212103d4f Bump commons-email 1.5 -> 1.6.0
new 78d232a47d Merge remote-tracking branch 'origin/master' into spring6
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bom/pom.xml | 2 +-
core/runtimeservices/pom.xml | 4 +++
.../runtimeservices/src/main/java/module-info.java | 2 +-
.../runtimeservices/email/EmailServiceDefault.java | 34 ++++++++++------------
.../bootstrap/css/bootstrap-overrides-all-v2.css | 23 +++++++++++++++
.../ui/pages/common/sidebar/css/simple-sidebar.css | 14 ++++-----
6 files changed, 52 insertions(+), 27 deletions(-)
(causeway) 01/01: Merge remote-tracking branch 'origin/master' into spring6
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 78d232a47de30c9cde95766bb59a3786ee13949e
Merge: 2760ec0028 f212103d4f
Author: andi-huber <ah...@apache.org>
AuthorDate: Mon Dec 25 16:12:18 2023 +0100
Merge remote-tracking branch 'origin/master' into spring6
bom/pom.xml | 2 +-
core/runtimeservices/pom.xml | 4 +++
.../runtimeservices/src/main/java/module-info.java | 2 +-
.../runtimeservices/email/EmailServiceDefault.java | 34 ++++++++++------------
.../bootstrap/css/bootstrap-overrides-all-v2.css | 23 +++++++++++++++
.../ui/pages/common/sidebar/css/simple-sidebar.css | 14 ++++-----
6 files changed, 52 insertions(+), 27 deletions(-)
diff --cc bom/pom.xml
index f769d29d51,b503f570c1..a3aa05fc13
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@@ -94,7 -93,9 +94,7 @@@ It is therefore a copy of org.apache:ap
<assertj-guava.version>3.24.2</assertj-guava.version>
- <commons-email.version>1.5</commons-email.version>
- <camel.version>3.14.9</camel.version>
-
+ <commons-email.version>1.6.0</commons-email.version>
<commons-httpclient.version>4.5.12</commons-httpclient.version>
<commons-io.version>2.15.1</commons-io.version>
diff --cc core/runtimeservices/pom.xml
index 7ef9280450,f1b8a346b8..b71c27a305
--- a/core/runtimeservices/pom.xml
+++ b/core/runtimeservices/pom.xml
@@@ -137,10 -137,10 +137,14 @@@
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
++ <exclusion>
++ <groupId>com.sun.activation</groupId>
++ <artifactId>jakarta.activation</artifactId>
++ </exclusion>
</exclusions>
</dependency>
+ <!-- required by EmailServiceDefault on v2, n/a f. v3
<dependency>
- <!-- required by EmailServiceDefault -->
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<exclusions>
diff --cc core/runtimeservices/src/main/java/module-info.java
index c88c4c6c8d,8ed811dcf5..c88ffd98d8
--- a/core/runtimeservices/src/main/java/module-info.java
+++ b/core/runtimeservices/src/main/java/module-info.java
@@@ -54,10 -54,10 +54,10 @@@ module org.apache.causeway.core.runtime
exports org.apache.causeway.core.runtimeservices.xml;
exports org.apache.causeway.core.runtimeservices.xmlsnapshot;
- requires commons.email;
+ requires org.apache.commons.mail;
requires jakarta.activation;
requires jakarta.mail;
- requires java.annotation;
+ requires jakarta.annotation;
requires java.desktop;
requires java.sql;
requires java.xml;
diff --cc core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/email/EmailServiceDefault.java
index 0e55baf5f1,15115cddeb..578e0a6810
--- a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/email/EmailServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/email/EmailServiceDefault.java
@@@ -22,6 -22,13 +22,13 @@@ import java.util.Collections
import java.util.List;
import java.util.Properties;
-import javax.activation.DataSource;
-import javax.annotation.PostConstruct;
-import javax.annotation.Priority;
-import javax.inject.Inject;
-import javax.inject.Named;
++//import jakarta.activation.DataSource; TODO incompatible with commons-email 1.6.0
++import jakarta.annotation.PostConstruct;
++import jakarta.annotation.Priority;
++import jakarta.inject.Inject;
++import jakarta.inject.Named;
+
+ import org.apache.commons.mail.DefaultAuthenticator;
import org.apache.commons.mail.EmailException;
import org.apache.commons.mail.ImageHtmlEmail;
import org.apache.commons.mail.resolver.DataSourceClassPathResolver;
@@@ -147,7 -149,7 +149,7 @@@ public class EmailServiceDefault implem
final List<String> bccList,
final String subject,
final String body,
-- final DataSource... attachments) {
++ final jakarta.activation.DataSource... attachments) {
try {
final ImageHtmlEmail email = new ImageHtmlEmail();
@@@ -193,9 -192,8 +192,8 @@@
email.setHtmlMsg(body);
if (attachments != null && attachments.length > 0) {
-- for (DataSource attachment : attachments) {
- //TODO[ISIS-3275] commons email not available for jakarta API
- //email.attach(attachment, attachment.getName(), "");
- email.attach(attachment, attachment.getName(), "");
++ for (jakarta.activation.DataSource attachment : attachments) {
++ //email.attach(attachment, attachment.getName(), ""); TODO incompatible with commons-email 1.6.0
}
}