Merge branch '6.0' into 6.1

# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
lucee · Feb 2, 2024 · 2485dec · 2485dec
2 parents 7d84216 + bdcf402
commit 2485dec
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -311,12 +311,6 @@
     	<version>1.7.36</version>
       <scope>provided</scope>
     </dependency>
-   <dependency>
-      <groupId>org.lucee</groupId>
-      <artifactId>jakarta-activation-mail</artifactId>
-      <version>1.2.1</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>tagsoup</groupId>
       <artifactId>tagsoup</artifactId>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -570,12 +570,6 @@
     <version>1.7.36</version>
     <scope>provided</scope>
   </dependency>
-   <dependency>
-      <groupId>org.lucee</groupId>
-      <artifactId>jakarta-activation-mail</artifactId>
-      <version>1.2.1</version>
-      <scope>provided</scope>
-    </dependency>
   <dependency>
     <groupId>tagsoup</groupId>
     <artifactId>tagsoup</artifactId>