migrate to jakarta and java 17

Coreoz · Sep 20, 2024 · 51ca947 · 51ca947
1 parent e16ea1e
commit 51ca947
Show file tree

Hide file tree

Showing 27 changed files with 57 additions and 57 deletions.
diff --git a/plume-file-core/pom.xml b/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>

diff --git a/plume-file-core/src/main/java/com/coreoz/plume/file/services/FileService.java b/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;

diff --git a/.../src/main/java/com/coreoz/plume/file/services/configuration/FileConfigurationService.java b/.../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");
 	}

diff --git a/...-file-core/src/main/java/com/coreoz/plume/file/services/scheduled/FileScheduledTasks.java b/...-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 {

diff --git a/plume-file-metadata-database/pom.xml b/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>

diff --git a/...ile-metadata-database/src/main/java/com/coreoz/plume/file/db/FileMetadataDatabaseDao.java b/...ile-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;

diff --git a/...ata-database/src/main/java/com/coreoz/plume/file/service/FileMetadataDatabaseService.java b/...ata-database/src/main/java/com/coreoz/plume/file/service/FileMetadataDatabaseService.java
@@ -4,8 +4,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.file.db.FileMetadataDatabaseDao;
 import com.coreoz.plume.file.filetype.FileTypeDatabase;

diff --git a/...metadata-database/src/test/java/com/coreoz/plume/file/db/FileMetadataDatabaseDaoTest.java b/...metadata-database/src/test/java/com/coreoz/plume/file/db/FileMetadataDatabaseDaoTest.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/plume-file-storage-database/pom.xml b/plume-file-storage-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-storage-database</artifactId>

diff --git a/plume-file-storage-database/src/main/java/com/coreoz/plume/file/db/FileStorageDao.java b/plume-file-storage-database/src/main/java/com/coreoz/plume/file/db/FileStorageDao.java
@@ -9,8 +9,8 @@
 import java.util.Optional;
 import java.util.function.Function;
 
-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.QFileDataQueryDsl;

diff --git a/...rage-database/src/main/java/com/coreoz/plume/file/service/FileStorageDatabaseService.java b/...rage-database/src/main/java/com/coreoz/plume/file/service/FileStorageDatabaseService.java
@@ -5,8 +5,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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/plume-file-storage-database/src/test/java/com/coreoz/plume/file/db/FileStorageDaoTest.java b/plume-file-storage-database/src/test/java/com/coreoz/plume/file/db/FileStorageDaoTest.java
@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.assertj.core.api.Assertions;
 import org.junit.Assert;

diff --git a/plume-file-storage-system/pom.xml b/plume-file-storage-system/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-storage-system</artifactId>

diff --git a/...em/src/main/java/com/coreoz/plume/file/configuration/FileStorageConfigurationService.java b/...em/src/main/java/com/coreoz/plume/file/configuration/FileStorageConfigurationService.java
@@ -3,7 +3,7 @@
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 public class FileStorageConfigurationService {
     private final Config config;

diff --git a/...-storage-system/src/main/java/com/coreoz/plume/file/service/FileStorageSystemService.java b/...-storage-system/src/main/java/com/coreoz/plume/file/service/FileStorageSystemService.java
@@ -9,8 +9,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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/plume-file-web-download-jersey/pom.xml b/plume-file-web-download-jersey/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-web-download-jersey</artifactId>

diff --git a/...-web-download-jersey/src/main/java/com/coreoz/plume/file/cache/FileCacheServiceGuava.java b/...-web-download-jersey/src/main/java/com/coreoz/plume/file/cache/FileCacheServiceGuava.java
@@ -9,8 +9,8 @@
 import com.google.common.io.ByteStreams;
 import lombok.SneakyThrows;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.Optional;

diff --git a/...download-jersey/src/main/java/com/coreoz/plume/file/service/FileCacheDownloadService.java b/...download-jersey/src/main/java/com/coreoz/plume/file/service/FileCacheDownloadService.java
@@ -5,8 +5,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.Optional;

diff --git a/...-web-download-jersey/src/main/java/com/coreoz/plume/file/service/FileDownloadService.java b/...-web-download-jersey/src/main/java/com/coreoz/plume/file/service/FileDownloadService.java
@@ -5,8 +5,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.io.InputStream;
 import java.util.Optional;
 

diff --git a/...in/java/com/coreoz/plume/file/service/configuration/FileDownloadConfigurationService.java b/...in/java/com/coreoz/plume/file/service/configuration/FileDownloadConfigurationService.java
@@ -3,8 +3,8 @@
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.time.Duration;
 
 @Singleton

diff --git a/...wnload-jersey/src/main/java/com/coreoz/plume/file/service/url/FileDownloadUrlService.java b/...wnload-jersey/src/main/java/com/coreoz/plume/file/service/url/FileDownloadUrlService.java
@@ -3,8 +3,8 @@
 import com.coreoz.plume.file.service.configuration.FileDownloadConfigurationService;
 import com.coreoz.plume.file.services.url.FileUrlService;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class FileDownloadUrlService implements FileUrlService {

diff --git a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/webservices/FileWs.java b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/webservices/FileWs.java
@@ -10,18 +10,18 @@
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.Response.Status;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.Response.Status;
 import java.util.Objects;
 import java.util.Optional;
 

diff --git a/plume-file-web-upload-jersey/pom.xml b/plume-file-web-upload-jersey/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-web-upload-jersey</artifactId>

diff --git a/...ile-web-upload-jersey/src/main/java/com/coreoz/plume/file/FileUploadWebJerseyService.java b/...ile-web-upload-jersey/src/main/java/com/coreoz/plume/file/FileUploadWebJerseyService.java
@@ -4,8 +4,8 @@
 import com.coreoz.plume.file.services.filetype.FileType;
 import com.coreoz.plume.file.validator.FileUploadData;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
 public class FileUploadWebJerseyService {

diff --git a/...eb-upload-jersey/src/main/java/com/coreoz/plume/file/streaming/JaxRsFileItemIterator.java b/...eb-upload-jersey/src/main/java/com/coreoz/plume/file/streaming/JaxRsFileItemIterator.java
@@ -2,7 +2,7 @@
 
 import org.apache.commons.fileupload.RequestContext;
 
-import javax.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestContext;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 

diff --git a/...web-upload-jersey/src/test/java/com/coreoz/plume/file/FileUploadWebJerseyServiceTest.java b/...web-upload-jersey/src/test/java/com/coreoz/plume/file/FileUploadWebJerseyServiceTest.java
@@ -16,7 +16,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.io.InputStream;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.coreoz</groupId>
 	<artifactId>plume-file-parent</artifactId>
-	<version>3.1.2-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Plume File Parent</name>
@@ -69,12 +69,12 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
-		<javadoc.java-version>8</javadoc.java-version>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
+		<javadoc.java-version>17</javadoc.java-version>
 		<additionalparam>-Xdoclint:none</additionalparam>
 
-		<plume-framework-dependencies.version>4.2.3</plume-framework-dependencies.version>
+		<plume-framework-dependencies.version>4.2.4-SNAPSHOT</plume-framework-dependencies.version>
 	</properties>
 
 	<modules>