Plume and Jakarta update

Coreoz · Oct 14, 2024 · 7ac559f · 7ac559f
1 parent 30979c3
commit 7ac559f
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 65 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,8 +14,7 @@
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
 
-		<plume-dependencies.version>4.3.4</plume-dependencies.version>
-		<plume-file.version>3.1.0</plume-file.version>
+		<plume-dependencies.version>4.3.5-SNAPSHOT</plume-dependencies.version>
 	</properties>
 
 	<build>
@@ -130,18 +129,10 @@
 			<artifactId>jersey-container-grizzly2-http</artifactId>
 		</dependency>
 
-		<!-- to cool down eclipse  -->
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
-			<scope>provided</scope>
-		</dependency>
-
 		<!-- swagger -->
 		<dependency>
 			<groupId>io.swagger.core.v3</groupId>
-			<artifactId>swagger-jaxrs2</artifactId>
+			<artifactId>swagger-jaxrs2-jakarta</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>
@@ -171,27 +162,22 @@
 		<dependency>
 			<groupId>com.coreoz</groupId>
 			<artifactId>plume-file-core</artifactId>
-			<version>${plume-file.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.coreoz</groupId>
 			<artifactId>plume-file-metadata-database</artifactId>
-			<version>${plume-file.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.coreoz</groupId>
 			<artifactId>plume-file-storage-database</artifactId>
-			<version>${plume-file.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.coreoz</groupId>
 			<artifactId>plume-file-web-download-jersey</artifactId>
-			<version>${plume-file.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.coreoz</groupId>
 			<artifactId>plume-file-web-upload-jersey</artifactId>
-			<version>${plume-file.version}</version>
 		</dependency>
 
 		<!-- unit testing -->

diff --git a/src/main/java/com/coreoz/db/DatabaseInitializer.java b/src/main/java/com/coreoz/db/DatabaseInitializer.java
@@ -1,7 +1,7 @@
 package com.coreoz.db;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import javax.sql.DataSource;
 
 import org.flywaydb.core.Flyway;

diff --git a/src/main/java/com/coreoz/jersey/GrizzlySetup.java b/src/main/java/com/coreoz/jersey/GrizzlySetup.java
@@ -3,7 +3,7 @@
 import java.io.IOException;
 import java.net.URI;
 
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.glassfish.grizzly.http.server.CLStaticHttpHandler;
 import org.glassfish.grizzly.http.server.HttpServer;

diff --git a/src/main/java/com/coreoz/jersey/JerseyConfigProvider.java b/src/main/java/com/coreoz/jersey/JerseyConfigProvider.java
@@ -1,8 +1,8 @@
 package com.coreoz.jersey;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 import org.glassfish.jersey.media.multipart.MultiPartFeature;

diff --git a/src/main/java/com/coreoz/services/configuration/ConfigurationService.java b/src/main/java/com/coreoz/services/configuration/ConfigurationService.java
@@ -1,7 +1,7 @@
 package com.coreoz.services.configuration;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import com.typesafe.config.Config;
 

diff --git a/src/main/java/com/coreoz/webservices/admin/permissions/ProjectAdminPermissionService.java b/src/main/java/com/coreoz/webservices/admin/permissions/ProjectAdminPermissionService.java
@@ -5,8 +5,8 @@
 import com.coreoz.plume.admin.services.permissions.AdminPermissionService;
 import com.coreoz.plume.admin.services.permissions.AdminPermissions;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 import java.util.Set;
 
 @Singleton

diff --git a/src/main/java/com/coreoz/webservices/api/ExampleWs.java b/src/main/java/com/coreoz/webservices/api/ExampleWs.java
@@ -1,7 +1,7 @@
 package com.coreoz.webservices.api;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import com.coreoz.plume.jersey.security.permission.PublicApi;
 import com.coreoz.services.configuration.ConfigurationService;
@@ -10,12 +10,12 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 @Path("/example")
 @Tag(name = "example", description = "Manage exemple web-services")

diff --git a/src/main/java/com/coreoz/webservices/api/file/FileUploadWs.java b/src/main/java/com/coreoz/webservices/api/file/FileUploadWs.java
@@ -11,16 +11,16 @@
 import org.glassfish.jersey.media.multipart.FormDataBodyPart;
 import org.glassfish.jersey.media.multipart.FormDataParam;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.io.InputStream;
 import java.util.Set;
 

diff --git a/src/main/java/com/coreoz/webservices/internal/InternalApiAuthenticator.java b/src/main/java/com/coreoz/webservices/internal/InternalApiAuthenticator.java
@@ -1,7 +1,7 @@
 package com.coreoz.webservices.internal;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import com.coreoz.plume.jersey.security.basic.BasicAuthenticator;
 import com.coreoz.services.configuration.ConfigurationService;

diff --git a/src/main/java/com/coreoz/webservices/internal/MonitoringWs.java b/src/main/java/com/coreoz/webservices/internal/MonitoringWs.java
@@ -2,15 +2,15 @@
 
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
 
 import com.codahale.metrics.Metric;
 import com.coreoz.plume.db.transaction.TransactionManager;

diff --git a/src/main/java/com/coreoz/webservices/internal/SwaggerWs.java b/src/main/java/com/coreoz/webservices/internal/SwaggerWs.java
@@ -3,14 +3,14 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
 
 import com.coreoz.plume.jersey.security.basic.BasicAuthenticator;
 import com.coreoz.plume.jersey.security.permission.PublicApi;

diff --git a/src/test/java/com/coreoz/guice/TestableTimeProvider.java b/src/test/java/com/coreoz/guice/TestableTimeProvider.java
@@ -2,7 +2,7 @@
 
 import com.coreoz.plume.services.time.TimeProvider;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 import java.time.Clock;
 import java.time.Instant;
 import java.time.ZoneId;

diff --git a/src/test/java/com/coreoz/integration/SampleIntegrationTest.java b/src/test/java/com/coreoz/integration/SampleIntegrationTest.java
@@ -8,7 +8,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * An integration test sample.