fix javax/jakarta issues

Signed-off-by: Ceki Gulcu <[email protected]>
qos-ch · Oct 2, 2022 · 59dc1a1 · 59dc1a1
1 parent c92c42d
commit 59dc1a1
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/logback-classic-blackbox/pom.xml b/logback-classic-blackbox/pom.xml
@@ -23,16 +23,25 @@
         </dependency>
 
         <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <groupId>javax.mail</groupId>
+            <artifactId>javax.mail-api</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>jakarta.mail</groupId>
-            <artifactId>jakarta.mail-api</artifactId>
-            <scope>compile</scope>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>test</scope>
         </dependency>
 
+
+
         <dependency>
             <groupId>org.codehaus.janino</groupId>
             <artifactId>janino</artifactId>

diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml
@@ -116,10 +116,7 @@
           <groupId>junit</groupId>
           <artifactId>junit</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>com.sun.mail</groupId>
-          <artifactId>jakarta.mail</artifactId>
-        </exclusion>
+
       </exclusions>
     </dependency>
 

diff --git a/logback-core-blackbox/pom.xml b/logback-core-blackbox/pom.xml
@@ -25,22 +25,25 @@
 
 
         <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <groupId>javax.mail</groupId>
+            <artifactId>javax.mail-api</artifactId>
+            <scope>test</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>jakarta.mail</groupId>
-            <artifactId>jakarta.mail-api</artifactId>
-            <scope>compile</scope>
+            <groupId>javax.activation</groupId>
+            <artifactId>javax.activation-api</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.janino</groupId>
-            <artifactId>janino</artifactId>
-            <scope>compile</scope>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
+
     </dependencies>
 
     <build>