From 146f33d52aba2e8071d354b3d5c1ffcfc2289d31 Mon Sep 17 00:00:00 2001
From: Ceki Gulcu <ceki@qos.ch>
Date: Sun, 2 Oct 2022 21:58:38 +0200
Subject: [PATCH] fix build issues

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
---
 logback-classic-blackbox/pom.xml                     |  5 -----
 .../src/test/java/module-info.java                   |  1 -
 logback-core-blackbox/pom.xml                        | 12 ++----------
 logback-core-blackbox/src/test/java/module-info.java |  1 +
 pom.xml                                              |  2 +-
 5 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/logback-classic-blackbox/pom.xml b/logback-classic-blackbox/pom.xml
index 5574af6ab7..818cb2445d 100644
--- a/logback-classic-blackbox/pom.xml
+++ b/logback-classic-blackbox/pom.xml
@@ -22,11 +22,6 @@
             <artifactId>logback-classic</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>javax.mail-api</artifactId>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>com.sun.mail</groupId>
diff --git a/logback-classic-blackbox/src/test/java/module-info.java b/logback-classic-blackbox/src/test/java/module-info.java
index 92320936ff..6d8e40c43a 100644
--- a/logback-classic-blackbox/src/test/java/module-info.java
+++ b/logback-classic-blackbox/src/test/java/module-info.java
@@ -1,7 +1,6 @@
 module logback.classic.blackbox {
     requires ch.qos.logback.core;
     requires ch.qos.logback.classic;
-    requires jakarta.mail;
     requires janino;
 
     requires org.junit.jupiter.api;
diff --git a/logback-core-blackbox/pom.xml b/logback-core-blackbox/pom.xml
index d0c06129ce..ef04eee07f 100644
--- a/logback-core-blackbox/pom.xml
+++ b/logback-core-blackbox/pom.xml
@@ -28,22 +28,14 @@
             <groupId>javax.mail</groupId>
             <artifactId>javax.mail-api</artifactId>
             <scope>test</scope>
-            <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>javax.activation-api</artifactId>
+            <groupId>org.codehaus.janino</groupId>
+            <artifactId>janino</artifactId>
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-
     </dependencies>
 
     <build>
diff --git a/logback-core-blackbox/src/test/java/module-info.java b/logback-core-blackbox/src/test/java/module-info.java
index f776abd590..009b9cd280 100644
--- a/logback-core-blackbox/src/test/java/module-info.java
+++ b/logback-core-blackbox/src/test/java/module-info.java
@@ -4,6 +4,7 @@
     requires org.junit.jupiter.api;
     requires org.junit.jupiter.engine;
     requires janino;
+
     exports ch.qos.logback.core.blackbox.joran.conditional;
     exports ch.qos.logback.core.blackbox.joran;
 }
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 7a56fb2df3..82ad5f4817 100755
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
 
   <properties>
     <!-- yyyy-MM-dd'T'HH:mm:ss'Z' -->
-    <project.build.outputTimestamp>2022-10-02T19:09:00Z</project.build.outputTimestamp>    
+    <project.build.outputTimestamp>2022-10-02T19:57:00Z</project.build.outputTimestamp>    
     <jdk.version>8</jdk.version>
     <maven.compiler.source>${jdk.version}</maven.compiler.source>
     <maven.compiler.target>${jdk.version}</maven.compiler.target>