fixed

Issue #193
imixs · Aug 1, 2023 · 32b6b6d · 32b6b6d
1 parent f23de99
commit 32b6b6d
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 90 deletions.
diff --git a/imixs-archive-api/pom.xml b/imixs-archive-api/pom.xml
@@ -64,14 +64,7 @@
 	</licenses>
 
 
-	<dependencies>
-		<!-- JEE Dependencies -->
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-api</artifactId>
-			<version>8.0</version>
-			<scope>provided</scope>
-		</dependency>	
+	<dependencies>	
 		<dependency>
 			<groupId>org.imixs.workflow</groupId>
 			<artifactId>imixs-workflow-core</artifactId>
@@ -89,16 +82,6 @@
 			<artifactId>imixs-melman</artifactId>
 			<scope>compile</scope>
 		</dependency>
-
-
-		<!-- JSON Parser -->
-		<dependency>
-			<groupId>javax.json</groupId>
-			<artifactId>javax.json-api</artifactId>
-			<version>1.1</version>
-			<scope>provided</scope>
-		</dependency>
-
 
 	</dependencies>
 

diff --git a/imixs-archive-backup/pom.xml b/imixs-archive-backup/pom.xml
@@ -308,14 +308,6 @@
 			<artifactId>commons-net</artifactId>
 			<scope>compile</scope>
 		</dependency>
-
-		<!-- Java EE dependencies -->
-		<dependency>
-			<groupId>jakarta.platform</groupId>
-			<artifactId>jakarta.jakartaee-api</artifactId>
-			<version>10.0.0</version>
-			<scope>provided</scope>
-		</dependency>
 
 	</dependencies>
 

diff --git a/imixs-archive-documents/pom.xml b/imixs-archive-documents/pom.xml
@@ -8,13 +8,6 @@
 	<artifactId>imixs-archive-documents</artifactId>
 
 	<dependencies>
-		<!-- JEE Dependencies -->
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-api</artifactId>
-			<version>8.0</version>
-			<scope>provided</scope>
-		</dependency>
 		<!-- Imixs-Workflow dependencies -->
 		<dependency>
 			<groupId>org.imixs.workflow</groupId>

diff --git a/imixs-archive-exporter/pom.xml b/imixs-archive-exporter/pom.xml
@@ -34,9 +34,7 @@
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 		<failOnMissingWebXml>false</failOnMissingWebXml>
-
 		<org.imixs.workflow.version>6.0.2</org.imixs.workflow.version>
-		<jakarta.version>10.0.0</jakarta.version>
 		<microprofile.version>5.0</microprofile.version>
 		<microprofile-metrics.version>4.0</microprofile-metrics.version>
 
@@ -312,15 +310,6 @@
 
 	<dependencies>
 
-
-		<!-- Java EE dependencies -->
-		<dependency>
-			<groupId>jakarta.platform</groupId>
-			<artifactId>jakarta.jakartaee-api</artifactId>
-			<version>${jakarta.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
 		<!-- Microprofile -->
 		<dependency>
 			<groupId>org.eclipse.microprofile</groupId>

diff --git a/...s-archive-importer/src/main/java/org/imixs/archive/importer/DocumentImportController.java b/...s-archive-importer/src/main/java/org/imixs/archive/importer/DocumentImportController.java
@@ -28,15 +28,15 @@
 import java.util.Map;
 import java.util.logging.Logger;
 
-import javax.annotation.PostConstruct;
-import javax.ejb.EJB;
-import javax.faces.view.ViewScoped;
-import javax.inject.Named;
-
 import org.imixs.workflow.ItemCollection;
 import org.imixs.workflow.engine.scheduler.SchedulerController;
 import org.imixs.workflow.engine.scheduler.SchedulerService;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.ejb.EJB;
+import jakarta.faces.view.ViewScoped;
+import jakarta.inject.Named;
+
 /**
  * The DocumentImportController is used to configure the import scheduler.
  * <p>

diff --git a/imixs-archive-importer/src/main/java/org/imixs/archive/importer/DocumentImportScheduler.java b/imixs-archive-importer/src/main/java/org/imixs/archive/importer/DocumentImportScheduler.java
@@ -27,16 +27,16 @@
 import java.util.Map;
 import java.util.logging.Logger;
 
-import javax.ejb.EJB;
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
-
 import org.imixs.workflow.ItemCollection;
 import org.imixs.workflow.engine.scheduler.Scheduler;
 import org.imixs.workflow.engine.scheduler.SchedulerException;
 import org.imixs.workflow.engine.scheduler.SchedulerService;
 import org.imixs.workflow.exceptions.QueryException;
 
+import jakarta.ejb.EJB;
+import jakarta.enterprise.event.Event;
+import jakarta.inject.Inject;
+
 /**
  * The DocumentImportScheduler iterates over all source definition and sends a
  * DocumentImportEvent to process the source by an external service

diff --git a/imixs-archive-importer/src/main/java/org/imixs/archive/importer/DocumentImportService.java b/imixs-archive-importer/src/main/java/org/imixs/archive/importer/DocumentImportService.java
@@ -28,15 +28,15 @@
 import java.util.Properties;
 import java.util.logging.Logger;
 
-import javax.ejb.EJB;
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
-
 import org.imixs.workflow.ItemCollection;
 import org.imixs.workflow.engine.WorkflowService;
 import org.imixs.workflow.engine.scheduler.Scheduler;
 import org.imixs.workflow.exceptions.PluginException;
 
+import jakarta.ejb.EJB;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Stateless;
+
 /**
  * The DocumentImportService provides definitions and methods to process a
  * import source.

diff --git a/imixs-archive-importer/src/main/java/org/imixs/archive/importer/ftp/CSVImportService.java b/imixs-archive-importer/src/main/java/org/imixs/archive/importer/ftp/CSVImportService.java
@@ -43,10 +43,6 @@
 import java.util.StringTokenizer;
 import java.util.logging.Logger;
 
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.apache.commons.net.ftp.FTP;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPSClient;
@@ -61,6 +57,10 @@
 import org.imixs.workflow.exceptions.ProcessingErrorException;
 import org.imixs.workflow.exceptions.QueryException;
 
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 /**
  * The CSVImportService reacts on DocumentImportEvent and importes a CSV file
  * form a FTP data source.

diff --git a/...rchive-importer/src/main/java/org/imixs/archive/importer/mail/IMAPBasicAuthenticator.java b/...rchive-importer/src/main/java/org/imixs/archive/importer/mail/IMAPBasicAuthenticator.java
@@ -33,14 +33,15 @@
 import java.util.Properties;
 import java.util.logging.Logger;
 
-import javax.inject.Named;
 import javax.mail.MessagingException;
 import javax.mail.Session;
 import javax.mail.Store;
 
 import org.imixs.archive.importer.DocumentImportService;
 import org.imixs.workflow.ItemCollection;
 
+import jakarta.inject.Named;
+
 /**
  * The IMAPBasicAuthenticator authenticates against an Mail store using BASIC
  * authentication

diff --git a/imixs-archive-importer/src/main/java/org/imixs/archive/importer/mail/IMAPImportService.java b/imixs-archive-importer/src/main/java/org/imixs/archive/importer/mail/IMAPImportService.java
@@ -37,12 +37,6 @@
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
 import javax.mail.Address;
 import javax.mail.BodyPart;
 import javax.mail.Folder;
@@ -67,6 +61,13 @@
 
 import com.sun.mail.imap.IMAPFolder;
 
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+
 /**
  * The EmailImportAdapter scans a IMAP account
  * <p>

diff --git a/...hive-importer/src/main/java/org/imixs/archive/importer/mail/IMAPOutlookAuthenticator.java b/...hive-importer/src/main/java/org/imixs/archive/importer/mail/IMAPOutlookAuthenticator.java
@@ -37,7 +37,6 @@
 import java.util.Properties;
 import java.util.logging.Logger;
 
-import javax.inject.Named;
 import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonReader;
@@ -49,6 +48,8 @@
 import org.imixs.archive.importer.DocumentImportService;
 import org.imixs.workflow.ItemCollection;
 
+import jakarta.inject.Named;
+
 /**
  * The IMAPOutlookAuthenticator authenticates against Microsoft Outlook using
  * OAUTH2.

diff --git a/...-archive-importer/src/main/java/org/imixs/archive/importer/mail/MailConverterService.java b/...-archive-importer/src/main/java/org/imixs/archive/importer/mail/MailConverterService.java
@@ -30,8 +30,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
 import javax.mail.BodyPart;
 import javax.mail.Message;
 import javax.mail.MessagingException;
@@ -41,6 +39,9 @@
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeUtility;
 
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Stateless;
+
 /**
  * The MailConverterService provides methods to convert a Mail Message object
  * into a html or pdf document.
@@ -354,7 +355,7 @@ private MimeBodyPart findMimeBodyPartByID(Multipart mp, String id) throws Messag
      * @throws MessagingException
      */
     private boolean isImagePart(Part bp, String id) throws MessagingException {
-        if (bp instanceof javax.mail.internet.MimeBodyPart) {
+        if (bp instanceof jakarta.mail.internet.MimeBodyPart) {
             MimeBodyPart mbp = (MimeBodyPart) bp;
             String currentID = mbp.getContentID();
             String contentType = mbp.getContentType();

diff --git a/imixs-archive-importer/src/main/java/org/imixs/archive/importer/mail/MailMessageService.java b/imixs-archive-importer/src/main/java/org/imixs/archive/importer/mail/MailMessageService.java
@@ -28,15 +28,16 @@
 import java.nio.charset.StandardCharsets;
 import java.util.logging.Logger;
 
-import javax.ejb.EJB;
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
 import javax.mail.Message;
 import javax.mail.MessagingException;
 
 import org.imixs.workflow.FileData;
 import org.imixs.workflow.ItemCollection;
 
+import jakarta.ejb.EJB;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Stateless;
+
 /**
  * The MessageService provides methods attach Message objects as a file to a
  * workitem.

diff --git a/imixs-archive-service/pom.xml b/imixs-archive-service/pom.xml
@@ -318,16 +318,6 @@
 
 	<dependencies>
 
-
-
-		<!-- Java EE dependencies -->
-		<dependency>
-			<groupId>jakarta.platform</groupId>
-			<artifactId>jakarta.jakartaee-api</artifactId>
-			<version>${jakarta.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
 		<!-- Microprofile -->
 		<dependency>
 			<groupId>org.eclipse.microprofile</groupId>

diff --git a/imixs-archive-service/src/main/java/org/imixs/archive/service/cassandra/ClusterService.java b/imixs-archive-service/src/main/java/org/imixs/archive/service/cassandra/ClusterService.java
@@ -15,10 +15,6 @@
 import java.util.Optional;
 import java.util.logging.Logger;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
-import jakarta.ejb.Singleton;
-import jakarta.inject.Inject;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManagerFactory;
@@ -28,14 +24,18 @@
 
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.Cluster.Builder;
-
 import com.datastax.driver.core.RemoteEndpointAwareJdkSSLOptions;
 import com.datastax.driver.core.SSLOptions;
 import com.datastax.driver.core.Session;
 import com.datastax.driver.core.exceptions.InvalidQueryException;
 import com.datastax.driver.core.policies.DefaultRetryPolicy;
 import com.datastax.driver.core.policies.RoundRobinPolicy;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.ejb.Singleton;
+import jakarta.inject.Inject;
+
 /**
  * The ClusterService provides methods to persist the content of a Imixs
  * Document into a Cassandra keystore.