diff --git a/coffee-bom/coffee-bom-all/pom.xml b/coffee-bom/coffee-bom-all/pom.xml
index 4bc7af17e..ea38333a4 100644
--- a/coffee-bom/coffee-bom-all/pom.xml
+++ b/coffee-bom/coffee-bom-all/pom.xml
@@ -23,6 +23,7 @@
1.15
3.2.2
2.11.0
+ 2.0.0-M1
6.2.1.Final
6.2.13.Final
4.5.13
@@ -173,6 +174,12 @@
${version.commons-io}
+
+ org.apache.commons
+ commons-email2-jakarta
+ ${version.commons-email2-jakarta}
+
+
org.jboss.resteasy
diff --git a/coffee-bom/coffee-bom-project/pom.xml b/coffee-bom/coffee-bom-project/pom.xml
index fde6f0646..4ebda4c8c 100644
--- a/coffee-bom/coffee-bom-project/pom.xml
+++ b/coffee-bom/coffee-bom-project/pom.xml
@@ -158,11 +158,11 @@
coffee-module-document-action
${project.version}
-
-
-
-
-
+
+ hu.icellmobilsoft.coffee
+ coffee-module-notification
+ ${project.version}
+
hu.icellmobilsoft.coffee
coffee-module-notification-dto
diff --git a/coffee-dto/pom.xml b/coffee-dto/pom.xml
index b5bc53e81..12cf212b8 100644
--- a/coffee-dto/pom.xml
+++ b/coffee-dto/pom.xml
@@ -84,4 +84,4 @@
coffee-dto-xsd2proto
coffee-dto-stub-gen
-
\ No newline at end of file
+
diff --git a/coffee-module/coffee-module-notification/coffee-module-notification-action/pom.xml b/coffee-module/coffee-module-notification/coffee-module-notification-action/pom.xml
index 17885dc96..fd79bd4e9 100644
--- a/coffee-module/coffee-module-notification/coffee-module-notification-action/pom.xml
+++ b/coffee-module/coffee-module-notification/coffee-module-notification-action/pom.xml
@@ -3,7 +3,7 @@
hu.icellmobilsoft.coffee
coffee-module-notification
- 2.3.0-SNAPSHOT
+ 2.9.0-SNAPSHOT
coffee-module-notification-action
@@ -33,22 +33,9 @@
hu.icellmobilsoft.coffee
coffee-rest
-
org.apache.commons
- commons-email
- 1.5
-
-
- com.sun.mail
- javax.mail
-
-
-
-
- com.sun.mail
- jakarta.mail
- 2.0.1
+ commons-email2-jakarta
-
\ No newline at end of file
+
diff --git a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/AbstractEmailPlainTextAction.java b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/AbstractEmailPlainTextAction.java
index e48bc2c90..0cd223327 100644
--- a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/AbstractEmailPlainTextAction.java
+++ b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/AbstractEmailPlainTextAction.java
@@ -30,8 +30,8 @@
import hu.icellmobilsoft.coffee.cdi.logger.ThisLogger;
import hu.icellmobilsoft.coffee.dto.common.common.KeyValueBasicType;
import hu.icellmobilsoft.coffee.dto.document.document.TemplateFullType;
-import hu.icellmobilsoft.coffee.dto.exception.BaseException;
import hu.icellmobilsoft.coffee.dto.notification.notification.EmailPlainTextType;
+import hu.icellmobilsoft.coffee.se.api.exception.BaseException;
/**
* AbstractEmailPlainTextAction class.
diff --git a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/AbstractEmailTemplateAction.java b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/AbstractEmailTemplateAction.java
index 840b9f443..2622a439d 100644
--- a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/AbstractEmailTemplateAction.java
+++ b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/AbstractEmailTemplateAction.java
@@ -30,8 +30,8 @@
import hu.icellmobilsoft.coffee.cdi.logger.ThisLogger;
import hu.icellmobilsoft.coffee.dto.common.common.KeyValueBasicType;
import hu.icellmobilsoft.coffee.dto.document.document.TemplateFullType;
-import hu.icellmobilsoft.coffee.dto.exception.BaseException;
import hu.icellmobilsoft.coffee.dto.notification.notification.EmailTemplateType;
+import hu.icellmobilsoft.coffee.se.api.exception.BaseException;
/**
* AbstractEmailTemplateAction class.
diff --git a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/EmailBase.java b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/EmailBase.java
index 5e44c2515..85a272e4c 100644
--- a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/EmailBase.java
+++ b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/EmailBase.java
@@ -34,16 +34,16 @@
import jakarta.mail.util.ByteArrayDataSource;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.mail.Email;
-import org.apache.commons.mail.EmailException;
-import org.apache.commons.mail.MultiPartEmail;
+import org.apache.commons.mail2.core.EmailException;
+import org.apache.commons.mail2.jakarta.Email;
+import org.apache.commons.mail2.jakarta.MultiPartEmail;
import hu.icellmobilsoft.coffee.cdi.logger.AppLogger;
import hu.icellmobilsoft.coffee.cdi.logger.ThisLogger;
-import hu.icellmobilsoft.coffee.dto.exception.BaseException;
-import hu.icellmobilsoft.coffee.dto.exception.TechnicalException;
import hu.icellmobilsoft.coffee.dto.exception.enums.CoffeeFaultType;
import hu.icellmobilsoft.coffee.module.notification.action.email.annotation.EmailOnly;
+import hu.icellmobilsoft.coffee.se.api.exception.BaseException;
+import hu.icellmobilsoft.coffee.se.api.exception.TechnicalException;
/**
* Handles basic e-mail sending, based on Apache commons-email
@@ -104,6 +104,13 @@ public class EmailBase {
private Object content;
private String to;
+ /**
+ * Default constructor, constructs a new object.
+ */
+ public EmailBase() {
+ super();
+ }
+
/**
* Setter for {@code mailSession} field of {@link Email}.
*
@@ -416,7 +423,7 @@ public String emailString(Email email) throws BaseException {
}
/**
- * Getter for the field {@code email}. If it's not initialized yet, creates an {@link org.apache.commons.mail.MultiPartEmail} instance. For a
+ * Getter for the field {@code email}. If it's not initialized yet, creates an {@link MultiPartEmail} instance. For a
* different {@link Email} class, use {@link #setEmail(Email)}.
*
* @return {@code email}
diff --git a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/EmailDataBase.java b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/EmailDataBase.java
index db38a7384..adbbb75ba 100644
--- a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/EmailDataBase.java
+++ b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/EmailDataBase.java
@@ -24,8 +24,8 @@
import hu.icellmobilsoft.coffee.cdi.logger.AppLogger;
import hu.icellmobilsoft.coffee.cdi.logger.ThisLogger;
-import hu.icellmobilsoft.coffee.dto.exception.BaseException;
import hu.icellmobilsoft.coffee.module.notification.model.Email;
+import hu.icellmobilsoft.coffee.se.api.exception.BaseException;
/**
* Extends the functionality of {@link EmailBase} with database save. Operates with OUTPUT_JOB table.
diff --git a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/EmailHelper.java b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/EmailHelper.java
index 7654f4dfe..4c68f5b36 100644
--- a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/EmailHelper.java
+++ b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/email/EmailHelper.java
@@ -29,7 +29,6 @@
import org.apache.commons.lang3.StringUtils;
import hu.icellmobilsoft.coffee.dto.exception.BONotFoundException;
-import hu.icellmobilsoft.coffee.dto.exception.BaseException;
import hu.icellmobilsoft.coffee.jpa.annotation.Transactional;
import hu.icellmobilsoft.coffee.module.notification.model.Email;
import hu.icellmobilsoft.coffee.module.notification.model.EmailRecipient;
@@ -38,6 +37,7 @@
import hu.icellmobilsoft.coffee.module.notification.service.EmailRecipientService;
import hu.icellmobilsoft.coffee.module.notification.service.EmailService;
import hu.icellmobilsoft.coffee.module.notification.service.RecipientService;
+import hu.icellmobilsoft.coffee.se.api.exception.BaseException;
/**
* CDI helper class for email handling
@@ -68,6 +68,14 @@ public class EmailHelper implements Serializable {
@Inject
private EmailService emailService;
+
+ /**
+ * Default constructor, constructs a new object.
+ */
+ public EmailHelper() {
+ super();
+ }
+
/**
* Inserts {@link EmailDataBase} into DB.
*
diff --git a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/push/AbstractPushAction.java b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/push/AbstractPushAction.java
index 7b55d0fb0..9760c5672 100644
--- a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/push/AbstractPushAction.java
+++ b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/push/AbstractPushAction.java
@@ -32,8 +32,6 @@
import hu.icellmobilsoft.coffee.cdi.logger.ThisLogger;
import hu.icellmobilsoft.coffee.dto.common.common.KeyValueBasicType;
import hu.icellmobilsoft.coffee.dto.document.document.TemplateFullType;
-import hu.icellmobilsoft.coffee.dto.exception.BaseException;
-import hu.icellmobilsoft.coffee.dto.exception.TechnicalException;
import hu.icellmobilsoft.coffee.dto.exception.enums.CoffeeFaultType;
import hu.icellmobilsoft.coffee.dto.notification.notification.DeviceOSType;
import hu.icellmobilsoft.coffee.dto.notification.notification.DeviceType;
@@ -41,6 +39,8 @@
import hu.icellmobilsoft.coffee.module.notification.exception.PushClientException;
import hu.icellmobilsoft.coffee.module.notification.exception.PushServerException;
import hu.icellmobilsoft.coffee.module.notification.model.Push;
+import hu.icellmobilsoft.coffee.se.api.exception.BaseException;
+import hu.icellmobilsoft.coffee.se.api.exception.TechnicalException;
/**
* Push notification business logic class
diff --git a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/push/PushHelper.java b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/push/PushHelper.java
index 847fbf9c0..24b019b5d 100644
--- a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/push/PushHelper.java
+++ b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/action/push/PushHelper.java
@@ -29,13 +29,13 @@
import org.apache.commons.lang3.StringUtils;
import hu.icellmobilsoft.coffee.dto.common.common.KeyValueBasicType;
-import hu.icellmobilsoft.coffee.dto.exception.BaseException;
import hu.icellmobilsoft.coffee.dto.notification.notification.DeviceType;
import hu.icellmobilsoft.coffee.jpa.annotation.Transactional;
import hu.icellmobilsoft.coffee.module.notification.model.Push;
import hu.icellmobilsoft.coffee.module.notification.model.PushDevice;
import hu.icellmobilsoft.coffee.module.notification.service.PushDeviceService;
import hu.icellmobilsoft.coffee.module.notification.service.PushService;
+import hu.icellmobilsoft.coffee.se.api.exception.BaseException;
import hu.icellmobilsoft.coffee.tool.gson.JsonUtil;
import hu.icellmobilsoft.coffee.tool.utils.enums.EnumUtil;
diff --git a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/exception/PushClientException.java b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/exception/PushClientException.java
index 2f6bd4bf7..7a31f4c1a 100644
--- a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/exception/PushClientException.java
+++ b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/exception/PushClientException.java
@@ -19,8 +19,8 @@
*/
package hu.icellmobilsoft.coffee.module.notification.exception;
-import hu.icellmobilsoft.coffee.dto.exception.TechnicalException;
import hu.icellmobilsoft.coffee.dto.exception.enums.CoffeeFaultType;
+import hu.icellmobilsoft.coffee.se.api.exception.TechnicalException;
/**
* PushClientException class.
diff --git a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/exception/PushServerException.java b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/exception/PushServerException.java
index 8beb1b094..cc38499ac 100644
--- a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/exception/PushServerException.java
+++ b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/exception/PushServerException.java
@@ -19,8 +19,8 @@
*/
package hu.icellmobilsoft.coffee.module.notification.exception;
-import hu.icellmobilsoft.coffee.dto.exception.TechnicalException;
import hu.icellmobilsoft.coffee.dto.exception.enums.CoffeeFaultType;
+import hu.icellmobilsoft.coffee.se.api.exception.TechnicalException;
/**
* PushServerException class.
diff --git a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/service/RecipientService.java b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/service/RecipientService.java
index 97581d186..91169fbe3 100644
--- a/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/service/RecipientService.java
+++ b/coffee-module/coffee-module-notification/coffee-module-notification-action/src/main/java/hu/icellmobilsoft/coffee/module/notification/service/RecipientService.java
@@ -28,12 +28,12 @@
import hu.icellmobilsoft.coffee.cdi.logger.AppLogger;
import hu.icellmobilsoft.coffee.cdi.logger.ThisLogger;
import hu.icellmobilsoft.coffee.dto.exception.BONotFoundException;
-import hu.icellmobilsoft.coffee.dto.exception.BaseException;
-import hu.icellmobilsoft.coffee.dto.exception.TechnicalException;
import hu.icellmobilsoft.coffee.dto.exception.enums.CoffeeFaultType;
import hu.icellmobilsoft.coffee.jpa.service.BaseService;
import hu.icellmobilsoft.coffee.module.notification.model.Recipient;
import hu.icellmobilsoft.coffee.module.notification.repository.RecipientRepository;
+import hu.icellmobilsoft.coffee.se.api.exception.BaseException;
+import hu.icellmobilsoft.coffee.se.api.exception.TechnicalException;
/**
* Service for {@link Recipient} functionality. Represents only DB operations
diff --git a/coffee-module/coffee-module-notification/coffee-module-notification-dto/pom.xml b/coffee-module/coffee-module-notification/coffee-module-notification-dto/pom.xml
index 50f97d631..a3dd95e4f 100644
--- a/coffee-module/coffee-module-notification/coffee-module-notification-dto/pom.xml
+++ b/coffee-module/coffee-module-notification/coffee-module-notification-dto/pom.xml
@@ -3,7 +3,7 @@
hu.icellmobilsoft.coffee
coffee-module-notification
- 2.3.0-SNAPSHOT
+ 2.9.0-SNAPSHOT
coffee-module-notification-dto
@@ -92,4 +92,4 @@
-
\ No newline at end of file
+
diff --git a/coffee-module/coffee-module-notification/pom.xml b/coffee-module/coffee-module-notification/pom.xml
index b205fd851..bb73e4106 100644
--- a/coffee-module/coffee-module-notification/pom.xml
+++ b/coffee-module/coffee-module-notification/pom.xml
@@ -3,7 +3,7 @@
hu.icellmobilsoft.coffee
coffee-module
- 2.3.0-SNAPSHOT
+ 2.9.0-SNAPSHOT
coffee-module-notification
diff --git a/coffee-module/pom.xml b/coffee-module/pom.xml
index ba53f3692..e3e1719c1 100644
--- a/coffee-module/pom.xml
+++ b/coffee-module/pom.xml
@@ -18,9 +18,7 @@
coffee-module-redis
coffee-module-redisstream
coffee-module-document
-
coffee-module-csv
coffee-module-ruleng
coffee-module-mp
diff --git a/docs/en/migration.adoc b/docs/en/migration.adoc
index 8eb691791..b2a5a249e 100644
--- a/docs/en/migration.adoc
+++ b/docs/en/migration.adoc
@@ -13,3 +13,4 @@ include::migration/migration240to250.adoc[leveloffset=+1]
include::migration/migration250to260.adoc[leveloffset=+1]
include::migration/migration260to270.adoc[leveloffset=+1]
include::migration/migration270to280.adoc[leveloffset=+1]
+include::migration/migration280to290.adoc[leveloffset=+1]
diff --git a/docs/en/migration/migration280to290.adoc b/docs/en/migration/migration280to290.adoc
new file mode 100644
index 000000000..5797d8944
--- /dev/null
+++ b/docs/en/migration/migration280to290.adoc
@@ -0,0 +1,6 @@
+= v2.8.0 → v2.9.0
+
+coff:ee v2.8.0 -> v2.9.0 migration description, news, changes
+
+=== coffee-module-notification
+The commons-email was updated to a Jakarta-compatible release, and the module has been re-enabled.
diff --git a/docs/hu/migration.adoc b/docs/hu/migration.adoc
index c3369366f..14bf22760 100644
--- a/docs/hu/migration.adoc
+++ b/docs/hu/migration.adoc
@@ -14,3 +14,4 @@ include::migration/migration240to250.adoc[leveloffset=+1]
include::migration/migration250to260.adoc[leveloffset=+1]
include::migration/migration260to270.adoc[leveloffset=+1]
include::migration/migration270to280.adoc[leveloffset=+1]
+include::migration/migration280to290.adoc[leveloffset=+1]
diff --git a/docs/hu/migration/migration280to290.adoc b/docs/hu/migration/migration280to290.adoc
new file mode 100644
index 000000000..f08ae3930
--- /dev/null
+++ b/docs/hu/migration/migration280to290.adoc
@@ -0,0 +1,6 @@
+= v2.8.0 → v2.9.0
+
+coff:ee v2.8.0 -> v2.9.0 migrációs leírás, újdonságok, változások leírása
+
+=== coffee-module-notification
+Frissítésre került a commons-email jakarta kompatibilis release, így ez a modul visszakapcsolásra került.