This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new e32c5b60b3 CAUSEWAY-3446: with com.sun.mail:jakarta.mail don't
transitively import javax.activation
e32c5b60b3 is described below
commit e32c5b60b35812b785d43489eeb11cec617313be
Author: Andi Huber <[email protected]>
AuthorDate: Wed Apr 26 09:22:48 2023 +0200
CAUSEWAY-3446: with com.sun.mail:jakarta.mail don't transitively import
javax.activation
- also don't put hsqldb on the (non-testing ) class-path
---
core/runtime/pom.xml | 33 ------------------------
core/runtimeservices/pom.xml | 60 +++++++++++++++++++++++++++++++++++++++-----
2 files changed, 54 insertions(+), 39 deletions(-)
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 8d57a40dfe..ce7bc670e3 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -83,7 +83,6 @@
<dependency>
<groupId>org.apache.causeway.valuetypes</groupId>
<artifactId>causeway-valuetypes-jodatime-integration</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- TESTING -->
@@ -96,36 +95,4 @@
</dependencies>
- <profiles>
- <profile>
- <id>email-notification-service</id>
- <activation>
- <property>
- <name>!skip.email-notification-service</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-email</artifactId>
- <exclusions>
- <!--
- excluded because provided by javax:javaee-api
- note: moved javax.mail from 1.5.2 to 1.5.0
- note: moved activation from 1.1.1 to 1.1 ... don't
know if this is significant.
- -->
- <exclusion>
- <groupId>com.sun.mail</groupId>
- <artifactId>javax.mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
diff --git a/core/runtimeservices/pom.xml b/core/runtimeservices/pom.xml
index e36c9f9cd1..f1b8a346b8 100644
--- a/core/runtimeservices/pom.xml
+++ b/core/runtimeservices/pom.xml
@@ -76,12 +76,6 @@
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
</dependency>
-
- <dependency>
- <!-- required by EmailServiceDefault -->
- <groupId>com.sun.mail</groupId>
- <artifactId>jakarta.mail</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.causeway.core</groupId>
@@ -91,6 +85,12 @@
<dependency>
<groupId>org.apache.causeway.core</groupId>
<artifactId>causeway-core-codegen-bytebuddy</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- TESTING -->
@@ -106,8 +106,56 @@
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<optional>true</optional>
+ <scope>test</scope>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>email-notification-service</id>
+ <activation>
+ <property>
+ <name>!skip.email-notification-service</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-email</artifactId>
+ <exclusions>
+ <!--
+ excluded because provided by javax:javaee-api
+ note: moved javax.mail from 1.5.2 to 1.5.0
+ note: moved activation from 1.1.1 to 1.1 ... don't
know if this is significant.
+ -->
+ <exclusion>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <!-- required by EmailServiceDefault -->
+ <groupId>com.sun.mail</groupId>
+ <artifactId>jakarta.mail</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+
<artifactId>jakarta.activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
