Merge pull request #22 from Coreoz/evol/to-jakarta

migrate to jakarta and java 17

Author: amanteaux

plume-file-core/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.coreoz</groupId>
 		<artifactId>plume-file-parent</artifactId>
-		<version>3.1.2-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>plume-file-core</artifactId>
@@ -53,14 +53,11 @@
 			<version>1.0.4</version>
 		</dependency>
 
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-core</artifactId>
-		</dependency>
+        <dependency>
+            <groupId>com.coreoz</groupId>
+            <artifactId>plume-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 	</dependencies>
 
 	<dependencyManagement>

plume-file-core/src/main/java/com/coreoz/plume/file/services/FileService.java

@@ -12,8 +12,8 @@
 import java.util.Optional;
 import java.util.UUID;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import com.coreoz.plume.file.services.mimetype.FileMimeTypeDetector;
 import com.coreoz.plume.file.services.mimetype.PeekingInputStream;

plume-file-core/src/main/java/com/coreoz/plume/file/services/configuration/FileConfigurationService.java

@@ -1,7 +1,7 @@
 package com.coreoz.plume.file.services.configuration;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
@@ -23,7 +23,7 @@ public FileConfigurationService(Config config) {
 	public String cleaningHour() {
 		return config.getString("file.cleaning-hour");
 	}
-	
+
 	public String checksumAlgorithm() {
 		return config.getString("file.checksum-algorithm");
 	}

plume-file-core/src/main/java/com/coreoz/plume/file/services/scheduled/FileScheduledTasks.java

@@ -5,8 +5,8 @@
 import com.coreoz.wisp.Scheduler;
 import com.coreoz.wisp.schedule.Schedules;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class FileScheduledTasks {

plume-file-core/src/test/java/com/coreoz/plume/file/cleaning/FileExtensionCleaningTest.java

@@ -1,6 +1,6 @@
 package com.coreoz.plume.file.cleaning;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

plume-file-core/src/test/java/com/coreoz/plume/file/cleaning/FileNameCleaningTest.java

@@ -1,6 +1,6 @@
 package com.coreoz.plume.file.cleaning;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

plume-file-core/src/test/java/com/coreoz/plume/file/service/data/MeasuredSizeInputStreamTest.java

@@ -1,7 +1,7 @@
 package com.coreoz.plume.file.service.data;
 
 import com.coreoz.plume.file.services.data.MeasuredSizeInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

plume-file-core/src/test/java/com/coreoz/plume/file/service/mimetype/MimeTypesDetectorTest.java

@@ -2,7 +2,7 @@
 
 import com.coreoz.plume.file.services.mimetype.MimeTypesDetector;
 import com.coreoz.plume.file.services.mimetype.PeekingInputStream;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

plume-file-metadata-database/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.coreoz</groupId>
 		<artifactId>plume-file-parent</artifactId>
-		<version>3.1.2-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>plume-file-metadata-database</artifactId>

plume-file-metadata-database/src/main/java/com/coreoz/plume/file/db/FileMetadataDatabaseDao.java

@@ -6,8 +6,8 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import com.coreoz.plume.db.querydsl.transaction.TransactionManagerQuerydsl;
 import com.coreoz.plume.file.db.beans.FileMetadataQuerydsl;