diff --git a/plume-file-core/pom.xml b/plume-file-core/pom.xml index fbd0049..3325e04 100644 --- a/plume-file-core/pom.xml +++ b/plume-file-core/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-file-parent - 3.1.2-SNAPSHOT + 4.0.0-SNAPSHOT plume-file-core 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 index 368556f..aa6ae92 100644 --- 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/plume-file-core/src/main/java/com/coreoz/plume/file/services/configuration/FileConfigurationService.java b/plume-file-core/src/main/java/com/coreoz/plume/file/services/configuration/FileConfigurationService.java index 2b37b96..3afc9d4 100644 --- a/plume-file-core/src/main/java/com/coreoz/plume/file/services/configuration/FileConfigurationService.java +++ b/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"); } diff --git a/plume-file-core/src/main/java/com/coreoz/plume/file/services/scheduled/FileScheduledTasks.java b/plume-file-core/src/main/java/com/coreoz/plume/file/services/scheduled/FileScheduledTasks.java index 8a625a8..1686ee2 100644 --- a/plume-file-core/src/main/java/com/coreoz/plume/file/services/scheduled/FileScheduledTasks.java +++ b/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 { diff --git a/plume-file-metadata-database/pom.xml b/plume-file-metadata-database/pom.xml index abb1a16..051d1f4 100644 --- a/plume-file-metadata-database/pom.xml +++ b/plume-file-metadata-database/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-file-parent - 3.1.2-SNAPSHOT + 4.0.0-SNAPSHOT plume-file-metadata-database diff --git a/plume-file-metadata-database/src/main/java/com/coreoz/plume/file/db/FileMetadataDatabaseDao.java b/plume-file-metadata-database/src/main/java/com/coreoz/plume/file/db/FileMetadataDatabaseDao.java index 4aa8488..8152cb3 100644 --- a/plume-file-metadata-database/src/main/java/com/coreoz/plume/file/db/FileMetadataDatabaseDao.java +++ b/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; diff --git a/plume-file-metadata-database/src/main/java/com/coreoz/plume/file/service/FileMetadataDatabaseService.java b/plume-file-metadata-database/src/main/java/com/coreoz/plume/file/service/FileMetadataDatabaseService.java index 9d0cc65..0bd3838 100644 --- a/plume-file-metadata-database/src/main/java/com/coreoz/plume/file/service/FileMetadataDatabaseService.java +++ b/plume-file-metadata-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/plume-file-metadata-database/src/test/java/com/coreoz/plume/file/db/FileMetadataDatabaseDaoTest.java b/plume-file-metadata-database/src/test/java/com/coreoz/plume/file/db/FileMetadataDatabaseDaoTest.java index e74753b..ffc4afc 100644 --- a/plume-file-metadata-database/src/test/java/com/coreoz/plume/file/db/FileMetadataDatabaseDaoTest.java +++ b/plume-file-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 index ccec392..8edd233 100644 --- a/plume-file-storage-database/pom.xml +++ b/plume-file-storage-database/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-file-parent - 3.1.2-SNAPSHOT + 4.0.0-SNAPSHOT plume-file-storage-database 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 index abb4a7c..fff0d74 100644 --- 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/plume-file-storage-database/src/main/java/com/coreoz/plume/file/service/FileStorageDatabaseService.java b/plume-file-storage-database/src/main/java/com/coreoz/plume/file/service/FileStorageDatabaseService.java index 0aa92dd..140280a 100644 --- a/plume-file-storage-database/src/main/java/com/coreoz/plume/file/service/FileStorageDatabaseService.java +++ b/plume-file-storage-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 index eefb5db..6e4be02 100644 --- 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 index 85bf5f5..bcc96f3 100644 --- a/plume-file-storage-system/pom.xml +++ b/plume-file-storage-system/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-file-parent - 3.1.2-SNAPSHOT + 4.0.0-SNAPSHOT plume-file-storage-system diff --git a/plume-file-storage-system/src/main/java/com/coreoz/plume/file/configuration/FileStorageConfigurationService.java b/plume-file-storage-system/src/main/java/com/coreoz/plume/file/configuration/FileStorageConfigurationService.java index 9e13eb3..bf7c98f 100644 --- a/plume-file-storage-system/src/main/java/com/coreoz/plume/file/configuration/FileStorageConfigurationService.java +++ b/plume-file-storage-system/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/plume-file-storage-system/src/main/java/com/coreoz/plume/file/service/FileStorageSystemService.java b/plume-file-storage-system/src/main/java/com/coreoz/plume/file/service/FileStorageSystemService.java index b7005e8..7ed8da9 100644 --- a/plume-file-storage-system/src/main/java/com/coreoz/plume/file/service/FileStorageSystemService.java +++ b/plume-file-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 index 29310d0..ce9ded6 100644 --- a/plume-file-web-download-jersey/pom.xml +++ b/plume-file-web-download-jersey/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-file-parent - 3.1.2-SNAPSHOT + 4.0.0-SNAPSHOT plume-file-web-download-jersey diff --git a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/cache/FileCacheServiceGuava.java b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/cache/FileCacheServiceGuava.java index b8723c6..59f38e7 100644 --- a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/cache/FileCacheServiceGuava.java +++ b/plume-file-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/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/FileCacheDownloadService.java b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/FileCacheDownloadService.java index 3bcde5b..769f76a 100644 --- a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/FileCacheDownloadService.java +++ b/plume-file-web-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/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/FileDownloadService.java b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/FileDownloadService.java index d10483f..860c34f 100644 --- a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/FileDownloadService.java +++ b/plume-file-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/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/configuration/FileDownloadConfigurationService.java b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/configuration/FileDownloadConfigurationService.java index e0e6be3..3f9e485 100644 --- a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/configuration/FileDownloadConfigurationService.java +++ b/plume-file-web-download-jersey/src/main/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/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/url/FileDownloadUrlService.java b/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/url/FileDownloadUrlService.java index eee0472..1c2fd3b 100644 --- a/plume-file-web-download-jersey/src/main/java/com/coreoz/plume/file/service/url/FileDownloadUrlService.java +++ b/plume-file-web-download-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 index 5139870..823ce6c 100644 --- 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 index d70b873..79331f6 100644 --- a/plume-file-web-upload-jersey/pom.xml +++ b/plume-file-web-upload-jersey/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-file-parent - 3.1.2-SNAPSHOT + 4.0.0-SNAPSHOT plume-file-web-upload-jersey diff --git a/plume-file-web-upload-jersey/src/main/java/com/coreoz/plume/file/FileUploadWebJerseyService.java b/plume-file-web-upload-jersey/src/main/java/com/coreoz/plume/file/FileUploadWebJerseyService.java index 2e54455..f2a2403 100644 --- a/plume-file-web-upload-jersey/src/main/java/com/coreoz/plume/file/FileUploadWebJerseyService.java +++ b/plume-file-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/plume-file-web-upload-jersey/src/main/java/com/coreoz/plume/file/streaming/JaxRsFileItemIterator.java b/plume-file-web-upload-jersey/src/main/java/com/coreoz/plume/file/streaming/JaxRsFileItemIterator.java index 6dc0c88..0d4b35e 100644 --- a/plume-file-web-upload-jersey/src/main/java/com/coreoz/plume/file/streaming/JaxRsFileItemIterator.java +++ b/plume-file-web-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/plume-file-web-upload-jersey/src/test/java/com/coreoz/plume/file/FileUploadWebJerseyServiceTest.java b/plume-file-web-upload-jersey/src/test/java/com/coreoz/plume/file/FileUploadWebJerseyServiceTest.java index 87a9534..a76fb25 100644 --- a/plume-file-web-upload-jersey/src/test/java/com/coreoz/plume/file/FileUploadWebJerseyServiceTest.java +++ b/plume-file-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 index c2a8584..bad6a21 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.coreoz plume-file-parent - 3.1.2-SNAPSHOT + 4.0.0-SNAPSHOT pom Plume File Parent @@ -69,12 +69,12 @@ UTF-8 - 11 - 11 - 8 + 17 + 17 + 17 -Xdoclint:none - 4.2.3 + 4.2.4-SNAPSHOT