From a5a2e1b8234234fc1fa59c65943b08130cb98468 Mon Sep 17 00:00:00 2001 From: Benoit Vasseur Date: Mon, 2 Sep 2024 18:16:53 +0200 Subject: [PATCH 1/6] Update jersey dependencies to 3.1.8 --- plume-db-querydsl/pom.xml | 8 ++++---- .../com/coreoz/plume/db/querydsl/db/QUser.java | 2 +- .../com/coreoz/plume/db/querydsl/db/User.java | 2 +- plume-framework-dependencies/pom.xml | 18 +++++++++--------- .../utils/info/ApplicationInfoProvider.java | 8 ++++---- plume-web-jersey/pom.xml | 8 ++++---- .../jersey/errors/WsJacksonJsonProvider.java | 4 ++-- .../jersey/errors/WsResultExceptionMapper.java | 14 +++++++------- .../plume/jersey/guice/JerseyGuiceFeature.java | 6 +++--- .../plume/jersey/java8/InstantConverter.java | 2 +- .../jersey/java8/LocalDateTimeConverter.java | 2 +- .../plume/jersey/java8/TimeParamProvider.java | 4 ++-- .../coreoz/plume/jersey/jee/ErrorServlet.java | 8 ++++---- .../com/coreoz/plume/jersey/jee/IeFilter.java | 14 +++++++------- .../security/basic/BasicAuthenticator.java | 12 ++++++------ .../security/permission/PermissionFeature.java | 12 ++++++------ .../permission/PermissionRequestProvider.java | 2 +- .../RequireExplicitAccessControlFeature.java | 12 ++++++------ 18 files changed, 69 insertions(+), 69 deletions(-) diff --git a/plume-db-querydsl/pom.xml b/plume-db-querydsl/pom.xml index e38f855..dc27230 100644 --- a/plume-db-querydsl/pom.xml +++ b/plume-db-querydsl/pom.xml @@ -16,10 +16,10 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api - + com.coreoz plume-db @@ -71,4 +71,4 @@ - \ No newline at end of file + diff --git a/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/db/QUser.java b/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/db/QUser.java index 4e09453..63c8040 100644 --- a/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/db/QUser.java +++ b/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/db/QUser.java @@ -5,7 +5,7 @@ import com.querydsl.core.types.dsl.*; import com.querydsl.core.types.PathMetadata; -import javax.annotation.Generated; +import jakarta.annotation.Generated; import com.querydsl.core.types.Path; import com.querydsl.sql.ColumnMetadata; diff --git a/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/db/User.java b/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/db/User.java index 328b8af..753a61b 100644 --- a/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/db/User.java +++ b/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/db/User.java @@ -1,6 +1,6 @@ package com.coreoz.plume.db.querydsl.db; -import javax.annotation.Generated; +import jakarta.annotation.Generated; import com.querydsl.sql.Column; /** diff --git a/plume-framework-dependencies/pom.xml b/plume-framework-dependencies/pom.xml index fd76d26..ca45854 100644 --- a/plume-framework-dependencies/pom.xml +++ b/plume-framework-dependencies/pom.xml @@ -18,7 +18,7 @@ 5.1.0 2.43.2 32.1.1-jre - 1 + 2.0.1 1.18.24 1.4.0 2.0.0 @@ -30,11 +30,11 @@ 9.3.0 2.2.220 2.16.1 - 2.35 + 3.1.8 2.2.20 2.6.1 1.8.0 - 1.3.2 + 3.0.0 4.1.2 4.8.161 3.9.6 @@ -104,9 +104,9 @@ - javax.inject - javax.inject - ${javax-inject.version} + jakarta.inject + jakarta.inject + ${jakarta-inject.version} @@ -288,9 +288,9 @@ - javax.annotation - javax.annotation-api - ${javax-annotation.version} + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation.version} diff --git a/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/utils/info/ApplicationInfoProvider.java b/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/utils/info/ApplicationInfoProvider.java index ebec0e2..f75845e 100644 --- a/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/utils/info/ApplicationInfoProvider.java +++ b/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/utils/info/ApplicationInfoProvider.java @@ -10,10 +10,10 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; -import javax.inject.Inject; -import javax.inject.Provider; -import javax.inject.Singleton; -import javax.validation.constraints.Negative; +import jakarta.inject.Inject; +import jakarta.inject.Provider; +import jakarta.inject.Singleton; +import jakarta.validation.constraints.Negative; import java.io.File; import java.io.FileReader; import java.io.IOException; diff --git a/plume-web-jersey/pom.xml b/plume-web-jersey/pom.xml index 669d4cb..6068ae7 100644 --- a/plume-web-jersey/pom.xml +++ b/plume-web-jersey/pom.xml @@ -90,9 +90,9 @@ - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + 6.1.0 provided @@ -109,4 +109,4 @@ - \ No newline at end of file + diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/WsJacksonJsonProvider.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/WsJacksonJsonProvider.java index fc709ef..b06285c 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/WsJacksonJsonProvider.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/WsJacksonJsonProvider.java @@ -5,8 +5,8 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/WsResultExceptionMapper.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/WsResultExceptionMapper.java index db37ae9..9a5b0ca 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/WsResultExceptionMapper.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/WsResultExceptionMapper.java @@ -1,11 +1,11 @@ package com.coreoz.plume.jersey.errors; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,4 +47,4 @@ public Response toResponse(Throwable e) { .build(); } -} \ No newline at end of file +} diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/guice/JerseyGuiceFeature.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/guice/JerseyGuiceFeature.java index b19d197..a596132 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/guice/JerseyGuiceFeature.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/guice/JerseyGuiceFeature.java @@ -1,7 +1,7 @@ package com.coreoz.plume.jersey.guice; -import javax.ws.rs.core.Feature; -import javax.ws.rs.core.FeatureContext; +import jakarta.ws.rs.core.Feature; +import jakarta.ws.rs.core.FeatureContext; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.jersey.InjectionManagerProvider; @@ -40,4 +40,4 @@ public boolean configure(FeatureContext context) { return true; } -} \ No newline at end of file +} diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/java8/InstantConverter.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/java8/InstantConverter.java index 536ed55..4ca221f 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/java8/InstantConverter.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/java8/InstantConverter.java @@ -4,7 +4,7 @@ import java.time.LocalDateTime; import java.time.ZoneId; -import javax.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/java8/LocalDateTimeConverter.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/java8/LocalDateTimeConverter.java index 173e500..43b56f4 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/java8/LocalDateTimeConverter.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/java8/LocalDateTimeConverter.java @@ -2,7 +2,7 @@ import java.time.LocalDateTime; -import javax.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/java8/TimeParamProvider.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/java8/TimeParamProvider.java index 994c49a..ddbf114 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/java8/TimeParamProvider.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/java8/TimeParamProvider.java @@ -6,8 +6,8 @@ import java.time.LocalDate; import java.time.LocalDateTime; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; public class TimeParamProvider implements ParamConverterProvider { diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/jee/ErrorServlet.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/jee/ErrorServlet.java index 823954f..d172fd0 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/jee/ErrorServlet.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/jee/ErrorServlet.java @@ -3,10 +3,10 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class ErrorServlet extends HttpServlet { diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/jee/IeFilter.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/jee/IeFilter.java index 85555a8..750dbab 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/jee/IeFilter.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/jee/IeFilter.java @@ -2,13 +2,13 @@ import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletResponse; /** * Add a X-UA-Compatible: IE=Edge header to each HTTP request diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/security/basic/BasicAuthenticator.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/security/basic/BasicAuthenticator.java index a28fb88..e020967 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/security/basic/BasicAuthenticator.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/security/basic/BasicAuthenticator.java @@ -4,12 +4,12 @@ import java.util.Base64; import java.util.function.Function; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/security/permission/PermissionFeature.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/security/permission/PermissionFeature.java index 74b447f..59c69b3 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/security/permission/PermissionFeature.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/security/permission/PermissionFeature.java @@ -6,12 +6,12 @@ import java.util.Collection; import java.util.function.Function; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.FeatureContext; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.FeatureContext; import org.glassfish.jersey.server.internal.LocalizationMessages; import org.slf4j.Logger; diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/security/permission/PermissionRequestProvider.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/security/permission/PermissionRequestProvider.java index d816370..f382e3f 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/security/permission/PermissionRequestProvider.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/security/permission/PermissionRequestProvider.java @@ -2,7 +2,7 @@ import java.util.Collection; -import javax.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestContext; /** * Extract permissions from the user corresponding to the current HTTP request diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/security/permission/RequireExplicitAccessControlFeature.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/security/permission/RequireExplicitAccessControlFeature.java index 2860cf6..b43f45b 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/security/permission/RequireExplicitAccessControlFeature.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/security/permission/RequireExplicitAccessControlFeature.java @@ -5,12 +5,12 @@ import java.lang.reflect.AnnotatedElement; import java.util.Set; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.FeatureContext; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.DynamicFeature; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.FeatureContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; From 243c971b0ce784f35b0a2965378fcccc566dac17 Mon Sep 17 00:00:00 2001 From: Benoit Vasseur Date: Wed, 4 Sep 2024 10:11:41 +0200 Subject: [PATCH 2/6] update version pom --- plume-conf/pom.xml | 2 +- plume-db-querydsl-codegen/pom.xml | 2 +- plume-db-querydsl/pom.xml | 2 +- plume-db-test/pom.xml | 2 +- plume-db/pom.xml | 2 +- plume-framework-dependencies/pom.xml | 2 +- plume-mail/pom.xml | 2 +- plume-scheduler/pom.xml | 2 +- plume-services/pom.xml | 2 +- plume-web-jersey-monitoring/pom.xml | 2 +- plume-web-jersey/pom.xml | 2 +- pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/plume-conf/pom.xml b/plume-conf/pom.xml index cfe7154..a77b69b 100644 --- a/plume-conf/pom.xml +++ b/plume-conf/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.4-SNAPSHOT + 4.2.5-SNAPSHOT plume-conf diff --git a/plume-db-querydsl-codegen/pom.xml b/plume-db-querydsl-codegen/pom.xml index d1825d9..a21d6d7 100644 --- a/plume-db-querydsl-codegen/pom.xml +++ b/plume-db-querydsl-codegen/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.4-SNAPSHOT + 4.2.5-SNAPSHOT plume-db-querydsl-codegen diff --git a/plume-db-querydsl/pom.xml b/plume-db-querydsl/pom.xml index dc27230..bfa37b5 100644 --- a/plume-db-querydsl/pom.xml +++ b/plume-db-querydsl/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.4-SNAPSHOT + 4.2.5-SNAPSHOT plume-db-querydsl diff --git a/plume-db-test/pom.xml b/plume-db-test/pom.xml index 9e2b773..46fb5f9 100644 --- a/plume-db-test/pom.xml +++ b/plume-db-test/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.4-SNAPSHOT + 4.2.5-SNAPSHOT plume-db-test diff --git a/plume-db/pom.xml b/plume-db/pom.xml index 5d26d4b..e4293d1 100644 --- a/plume-db/pom.xml +++ b/plume-db/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.4-SNAPSHOT + 4.2.5-SNAPSHOT plume-db diff --git a/plume-framework-dependencies/pom.xml b/plume-framework-dependencies/pom.xml index ca45854..5dbf71c 100644 --- a/plume-framework-dependencies/pom.xml +++ b/plume-framework-dependencies/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.4-SNAPSHOT + 4.2.5-SNAPSHOT plume-framework-dependencies diff --git a/plume-mail/pom.xml b/plume-mail/pom.xml index 180d671..a1dfb81 100644 --- a/plume-mail/pom.xml +++ b/plume-mail/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.4-SNAPSHOT + 4.2.5-SNAPSHOT plume-mail diff --git a/plume-scheduler/pom.xml b/plume-scheduler/pom.xml index 94bb59c..980fbf7 100644 --- a/plume-scheduler/pom.xml +++ b/plume-scheduler/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.4-SNAPSHOT + 4.2.5-SNAPSHOT plume-scheduler diff --git a/plume-services/pom.xml b/plume-services/pom.xml index 8b484bf..d203357 100644 --- a/plume-services/pom.xml +++ b/plume-services/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.4-SNAPSHOT + 4.2.5-SNAPSHOT plume-services diff --git a/plume-web-jersey-monitoring/pom.xml b/plume-web-jersey-monitoring/pom.xml index 93648aa..d1aa228 100644 --- a/plume-web-jersey-monitoring/pom.xml +++ b/plume-web-jersey-monitoring/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.4-SNAPSHOT + 4.2.5-SNAPSHOT plume-web-jersey-monitoring diff --git a/plume-web-jersey/pom.xml b/plume-web-jersey/pom.xml index 6068ae7..7c1aeb2 100644 --- a/plume-web-jersey/pom.xml +++ b/plume-web-jersey/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.4-SNAPSHOT + 4.2.5-SNAPSHOT plume-web-jersey diff --git a/pom.xml b/pom.xml index 8eb5b32..642aecf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.coreoz plume-parent - 4.2.4-SNAPSHOT + 4.2.5-SNAPSHOT pom Plume Parent From 4dec79ae9fc2534d90136373f09e9c55ea7bae11 Mon Sep 17 00:00:00 2001 From: Benoit Vasseur Date: Wed, 4 Sep 2024 18:36:44 +0200 Subject: [PATCH 3/6] Update javax to jakarta (include guice and jackson) --- README.md | 4 ++-- plume-conf/pom.xml | 2 +- .../java/com/coreoz/plume/conf/ConfigProvider.java | 6 +++--- .../com/coreoz/plume/conf/dagger/DaggerConfModule.java | 2 +- plume-db-querydsl-codegen/pom.xml | 2 +- plume-db-querydsl/pom.xml | 2 +- .../transaction/TransactionManagerQuerydsl.java | 4 ++-- .../plume/db/querydsl/crud/CrudDaoQuerydslTest.java | 2 +- .../querydsl/crud/CrudDaoQuerydslTransactionTest.java | 2 +- .../java/com/coreoz/plume/db/querydsl/db/UserDao.java | 4 ++-- .../transaction/TransactionInstancesHolder.java | 2 +- .../transaction/TransactionManagerQuerydslTest.java | 2 +- plume-db-test/pom.xml | 2 +- .../java/com/coreoz/plume/db/InitializeDatabase.java | 4 ++-- plume-db/pom.xml | 9 +++++++-- .../main/java/com/coreoz/plume/db/crud/CrudDao.java | 4 ++-- .../java/com/coreoz/plume/db/crud/CrudService.java | 2 +- .../plume/db/transaction/DataSourceProvider.java | 6 +++--- .../plume/db/transaction/TransactionManager.java | 4 ++-- plume-framework-dependencies/pom.xml | 10 +++++----- plume-mail/pom.xml | 2 +- .../java/com/coreoz/plume/mail/MailerProvider.java | 6 +++--- .../com/coreoz/plume/mail/dagger/DaggerMailModule.java | 2 +- plume-scheduler/pom.xml | 2 +- .../com/coreoz/plume/scheduler/SchedulerProvider.java | 6 +++--- .../plume/scheduler/dagger/DaggerSchedulerModule.java | 2 +- plume-services/pom.xml | 2 +- .../com/coreoz/plume/dagger/DaggerServicesModule.java | 2 +- .../coreoz/plume/services/time/SystemTimeProvider.java | 4 ++-- plume-web-jersey-monitoring/pom.xml | 2 +- .../JerseyMonitoringConfigurationService.java | 4 ++-- .../json/JerseyMonitoringObjectMapperProvider.java | 6 +++--- .../monitoring/utils/health/HealthCheckBuilder.java | 2 +- .../monitoring/utils/metrics/MetricsCheckBuilder.java | 2 +- plume-web-jersey/pom.xml | 6 +++--- .../com/coreoz/plume/jersey/async/AsyncJersey.java | 2 +- .../plume/jersey/dagger/DaggerJacksonModule.java | 2 +- .../plume/jersey/errors/WsJacksonJsonProvider.java | 6 +++--- .../plume/jersey/jackson/ObjectMapperProvider.java | 6 +++--- .../coreoz/plume/jersey/java8/LocalDateConverter.java | 2 +- pom.xml | 2 +- 41 files changed, 75 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index dc964de..ee958ff 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ A concrete example of how Plume works is the [Plume Mail](plume-mail/) module: - It provides the [Simple Java Mail](http://www.simplejavamail.org/) dependency - This module exposes 50 lines of code via the [MailerProvider](https://github.com/Coreoz/Plume/blob/master/plume-mail/src/main/java/com/coreoz/plume/mail/MailerProvider.java) class: - In the constructor, it populates the config object from Simple Mail Java using [Config](https://github.com/typesafehub/config) - - The `MailerProvider` class implements the `javax.inject.Provider` interface to expose the Simple Mail Java `Mailer` object. + - The `MailerProvider` class implements the `jakarta.inject.Provider` interface to expose the Simple Mail Java `Mailer` object. -In this way, it is easy to replace most of the components suggested by Plume. The only "strong" requirement is to provide dependency injection objects using `javax.inject`. +In this way, it is easy to replace most of the components suggested by Plume. The only "strong" requirement is to provide dependency injection objects using `jakarta.inject`. Plume is maintained by [Coreoz](http://coreoz.com/) and licensed under [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0). diff --git a/plume-conf/pom.xml b/plume-conf/pom.xml index a77b69b..cfe7154 100644 --- a/plume-conf/pom.xml +++ b/plume-conf/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.5-SNAPSHOT + 4.2.4-SNAPSHOT plume-conf diff --git a/plume-conf/src/main/java/com/coreoz/plume/conf/ConfigProvider.java b/plume-conf/src/main/java/com/coreoz/plume/conf/ConfigProvider.java index 624b09e..b58943e 100644 --- a/plume-conf/src/main/java/com/coreoz/plume/conf/ConfigProvider.java +++ b/plume-conf/src/main/java/com/coreoz/plume/conf/ConfigProvider.java @@ -1,8 +1,8 @@ package com.coreoz.plume.conf; -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 com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; diff --git a/plume-conf/src/main/java/com/coreoz/plume/conf/dagger/DaggerConfModule.java b/plume-conf/src/main/java/com/coreoz/plume/conf/dagger/DaggerConfModule.java index d51b725..2c15359 100644 --- a/plume-conf/src/main/java/com/coreoz/plume/conf/dagger/DaggerConfModule.java +++ b/plume-conf/src/main/java/com/coreoz/plume/conf/dagger/DaggerConfModule.java @@ -5,7 +5,7 @@ import dagger.Module; import dagger.Provides; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Module public class DaggerConfModule { diff --git a/plume-db-querydsl-codegen/pom.xml b/plume-db-querydsl-codegen/pom.xml index a21d6d7..d1825d9 100644 --- a/plume-db-querydsl-codegen/pom.xml +++ b/plume-db-querydsl-codegen/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.5-SNAPSHOT + 4.2.4-SNAPSHOT plume-db-querydsl-codegen diff --git a/plume-db-querydsl/pom.xml b/plume-db-querydsl/pom.xml index bfa37b5..dc27230 100644 --- a/plume-db-querydsl/pom.xml +++ b/plume-db-querydsl/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.5-SNAPSHOT + 4.2.4-SNAPSHOT plume-db-querydsl diff --git a/plume-db-querydsl/src/main/java/com/coreoz/plume/db/querydsl/transaction/TransactionManagerQuerydsl.java b/plume-db-querydsl/src/main/java/com/coreoz/plume/db/querydsl/transaction/TransactionManagerQuerydsl.java index d5c906c..6110561 100644 --- a/plume-db-querydsl/src/main/java/com/coreoz/plume/db/querydsl/transaction/TransactionManagerQuerydsl.java +++ b/plume-db-querydsl/src/main/java/com/coreoz/plume/db/querydsl/transaction/TransactionManagerQuerydsl.java @@ -4,8 +4,8 @@ import java.sql.SQLException; import java.util.function.Supplier; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import javax.sql.DataSource; import com.coreoz.plume.db.transaction.TransactionManager; diff --git a/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/crud/CrudDaoQuerydslTest.java b/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/crud/CrudDaoQuerydslTest.java index e3340e8..ec12bfe 100644 --- a/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/crud/CrudDaoQuerydslTest.java +++ b/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/crud/CrudDaoQuerydslTest.java @@ -6,7 +6,7 @@ import java.time.temporal.ChronoUnit; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.assertj.core.api.Assertions; import org.junit.Test; diff --git a/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/crud/CrudDaoQuerydslTransactionTest.java b/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/crud/CrudDaoQuerydslTransactionTest.java index fafe6cf..7a8c9fb 100644 --- a/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/crud/CrudDaoQuerydslTransactionTest.java +++ b/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/crud/CrudDaoQuerydslTransactionTest.java @@ -4,7 +4,7 @@ import java.sql.SQLException; -import javax.inject.Inject; +import jakarta.inject.Inject; import javax.sql.DataSource; import org.junit.Test; diff --git a/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/db/UserDao.java b/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/db/UserDao.java index c412f92..c83e6ae 100644 --- a/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/db/UserDao.java +++ b/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/db/UserDao.java @@ -1,7 +1,7 @@ package com.coreoz.plume.db.querydsl.db; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import com.coreoz.plume.db.querydsl.crud.CrudDaoQuerydsl; import com.coreoz.plume.db.querydsl.transaction.TransactionManagerQuerydsl; diff --git a/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/transaction/TransactionInstancesHolder.java b/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/transaction/TransactionInstancesHolder.java index 44a208e..92bd79b 100644 --- a/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/transaction/TransactionInstancesHolder.java +++ b/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/transaction/TransactionInstancesHolder.java @@ -43,4 +43,4 @@ public TransactionManagerQuerydsl getTransactionManager() { return transactionManager; } -} \ No newline at end of file +} diff --git a/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/transaction/TransactionManagerQuerydslTest.java b/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/transaction/TransactionManagerQuerydslTest.java index b2b9590..3592682 100644 --- a/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/transaction/TransactionManagerQuerydslTest.java +++ b/plume-db-querydsl/src/test/java/com/coreoz/plume/db/querydsl/transaction/TransactionManagerQuerydslTest.java @@ -4,7 +4,7 @@ import java.sql.SQLException; -import javax.inject.Inject; +import jakarta.inject.Inject; import javax.sql.DataSource; import org.junit.Test; diff --git a/plume-db-test/pom.xml b/plume-db-test/pom.xml index 46fb5f9..9e2b773 100644 --- a/plume-db-test/pom.xml +++ b/plume-db-test/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.5-SNAPSHOT + 4.2.4-SNAPSHOT plume-db-test diff --git a/plume-db-test/src/main/java/com/coreoz/plume/db/InitializeDatabase.java b/plume-db-test/src/main/java/com/coreoz/plume/db/InitializeDatabase.java index 3ba92de..1845aee 100644 --- a/plume-db-test/src/main/java/com/coreoz/plume/db/InitializeDatabase.java +++ b/plume-db-test/src/main/java/com/coreoz/plume/db/InitializeDatabase.java @@ -1,7 +1,7 @@ package com.coreoz.plume.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/plume-db/pom.xml b/plume-db/pom.xml index e4293d1..695a7c7 100644 --- a/plume-db/pom.xml +++ b/plume-db/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.5-SNAPSHOT + 4.2.4-SNAPSHOT plume-db @@ -29,6 +29,11 @@ guava + + jakarta.annotation + jakarta.annotation-api + + com.google.inject guice @@ -55,4 +60,4 @@ - \ No newline at end of file + diff --git a/plume-db/src/main/java/com/coreoz/plume/db/crud/CrudDao.java b/plume-db/src/main/java/com/coreoz/plume/db/crud/CrudDao.java index 5538f9e..77d6498 100644 --- a/plume-db/src/main/java/com/coreoz/plume/db/crud/CrudDao.java +++ b/plume-db/src/main/java/com/coreoz/plume/db/crud/CrudDao.java @@ -1,7 +1,7 @@ package com.coreoz.plume.db.crud; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.List; /** diff --git a/plume-db/src/main/java/com/coreoz/plume/db/crud/CrudService.java b/plume-db/src/main/java/com/coreoz/plume/db/crud/CrudService.java index 321c6ea..48314e1 100644 --- a/plume-db/src/main/java/com/coreoz/plume/db/crud/CrudService.java +++ b/plume-db/src/main/java/com/coreoz/plume/db/crud/CrudService.java @@ -1,6 +1,6 @@ package com.coreoz.plume.db.crud; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.util.List; import java.util.Optional; diff --git a/plume-db/src/main/java/com/coreoz/plume/db/transaction/DataSourceProvider.java b/plume-db/src/main/java/com/coreoz/plume/db/transaction/DataSourceProvider.java index 82a6490..2265520 100644 --- a/plume-db/src/main/java/com/coreoz/plume/db/transaction/DataSourceProvider.java +++ b/plume-db/src/main/java/com/coreoz/plume/db/transaction/DataSourceProvider.java @@ -1,8 +1,8 @@ package com.coreoz.plume.db.transaction; -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 javax.sql.DataSource; /** diff --git a/plume-db/src/main/java/com/coreoz/plume/db/transaction/TransactionManager.java b/plume-db/src/main/java/com/coreoz/plume/db/transaction/TransactionManager.java index 08c7eb2..5d0f093 100644 --- a/plume-db/src/main/java/com/coreoz/plume/db/transaction/TransactionManager.java +++ b/plume-db/src/main/java/com/coreoz/plume/db/transaction/TransactionManager.java @@ -5,8 +5,8 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import javax.sql.DataSource; import com.google.common.base.Throwables; diff --git a/plume-framework-dependencies/pom.xml b/plume-framework-dependencies/pom.xml index 5dbf71c..4d9d280 100644 --- a/plume-framework-dependencies/pom.xml +++ b/plume-framework-dependencies/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.5-SNAPSHOT + 4.2.4-SNAPSHOT plume-framework-dependencies @@ -15,7 +15,7 @@ 2.3.0 - 5.1.0 + 7.0.0 2.43.2 32.1.1-jre 2.0.1 @@ -29,7 +29,7 @@ 1.6.0 9.3.0 2.2.220 - 2.16.1 + 2.17.2 3.1.8 2.2.20 2.6.1 @@ -201,8 +201,8 @@ - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider + com.fasterxml.jackson.jakarta.rs + jackson-jakarta-rs-json-provider ${jackson.version} diff --git a/plume-mail/pom.xml b/plume-mail/pom.xml index a1dfb81..180d671 100644 --- a/plume-mail/pom.xml +++ b/plume-mail/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.5-SNAPSHOT + 4.2.4-SNAPSHOT plume-mail diff --git a/plume-mail/src/main/java/com/coreoz/plume/mail/MailerProvider.java b/plume-mail/src/main/java/com/coreoz/plume/mail/MailerProvider.java index 4f7c4f8..7e7a2e5 100644 --- a/plume-mail/src/main/java/com/coreoz/plume/mail/MailerProvider.java +++ b/plume-mail/src/main/java/com/coreoz/plume/mail/MailerProvider.java @@ -4,9 +4,9 @@ import java.nio.charset.StandardCharsets; import java.util.stream.Collectors; -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.simplejavamail.api.mailer.Mailer; import org.simplejavamail.config.ConfigLoader; diff --git a/plume-mail/src/main/java/com/coreoz/plume/mail/dagger/DaggerMailModule.java b/plume-mail/src/main/java/com/coreoz/plume/mail/dagger/DaggerMailModule.java index bc32d06..ea0ecd6 100644 --- a/plume-mail/src/main/java/com/coreoz/plume/mail/dagger/DaggerMailModule.java +++ b/plume-mail/src/main/java/com/coreoz/plume/mail/dagger/DaggerMailModule.java @@ -1,6 +1,6 @@ package com.coreoz.plume.mail.dagger; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import org.simplejavamail.api.mailer.Mailer; diff --git a/plume-scheduler/pom.xml b/plume-scheduler/pom.xml index 980fbf7..94bb59c 100644 --- a/plume-scheduler/pom.xml +++ b/plume-scheduler/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.5-SNAPSHOT + 4.2.4-SNAPSHOT plume-scheduler diff --git a/plume-scheduler/src/main/java/com/coreoz/plume/scheduler/SchedulerProvider.java b/plume-scheduler/src/main/java/com/coreoz/plume/scheduler/SchedulerProvider.java index baa3752..4642ece 100644 --- a/plume-scheduler/src/main/java/com/coreoz/plume/scheduler/SchedulerProvider.java +++ b/plume-scheduler/src/main/java/com/coreoz/plume/scheduler/SchedulerProvider.java @@ -1,8 +1,8 @@ package com.coreoz.plume.scheduler; -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 com.coreoz.plume.services.time.TimeProvider; import com.coreoz.wisp.Scheduler; diff --git a/plume-scheduler/src/main/java/com/coreoz/plume/scheduler/dagger/DaggerSchedulerModule.java b/plume-scheduler/src/main/java/com/coreoz/plume/scheduler/dagger/DaggerSchedulerModule.java index abaa112..4a9776d 100644 --- a/plume-scheduler/src/main/java/com/coreoz/plume/scheduler/dagger/DaggerSchedulerModule.java +++ b/plume-scheduler/src/main/java/com/coreoz/plume/scheduler/dagger/DaggerSchedulerModule.java @@ -1,6 +1,6 @@ package com.coreoz.plume.scheduler.dagger; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.coreoz.plume.dagger.DaggerServicesModule; import com.coreoz.plume.scheduler.SchedulerProvider; diff --git a/plume-services/pom.xml b/plume-services/pom.xml index d203357..8b484bf 100644 --- a/plume-services/pom.xml +++ b/plume-services/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.5-SNAPSHOT + 4.2.4-SNAPSHOT plume-services diff --git a/plume-services/src/main/java/com/coreoz/plume/dagger/DaggerServicesModule.java b/plume-services/src/main/java/com/coreoz/plume/dagger/DaggerServicesModule.java index 2f4c031..9483863 100644 --- a/plume-services/src/main/java/com/coreoz/plume/dagger/DaggerServicesModule.java +++ b/plume-services/src/main/java/com/coreoz/plume/dagger/DaggerServicesModule.java @@ -1,6 +1,6 @@ package com.coreoz.plume.dagger; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import com.coreoz.plume.services.time.SystemTimeProvider; import com.coreoz.plume.services.time.TimeProvider; diff --git a/plume-services/src/main/java/com/coreoz/plume/services/time/SystemTimeProvider.java b/plume-services/src/main/java/com/coreoz/plume/services/time/SystemTimeProvider.java index 14558fe..c5abbe1 100644 --- a/plume-services/src/main/java/com/coreoz/plume/services/time/SystemTimeProvider.java +++ b/plume-services/src/main/java/com/coreoz/plume/services/time/SystemTimeProvider.java @@ -2,8 +2,8 @@ import java.time.Clock; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton public class SystemTimeProvider implements TimeProvider { diff --git a/plume-web-jersey-monitoring/pom.xml b/plume-web-jersey-monitoring/pom.xml index d1aa228..93648aa 100644 --- a/plume-web-jersey-monitoring/pom.xml +++ b/plume-web-jersey-monitoring/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.5-SNAPSHOT + 4.2.4-SNAPSHOT plume-web-jersey-monitoring diff --git a/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/configuration/JerseyMonitoringConfigurationService.java b/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/configuration/JerseyMonitoringConfigurationService.java index 9df9194..d3fa901 100644 --- a/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/configuration/JerseyMonitoringConfigurationService.java +++ b/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/configuration/JerseyMonitoringConfigurationService.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.util.Map; @Singleton diff --git a/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/json/JerseyMonitoringObjectMapperProvider.java b/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/json/JerseyMonitoringObjectMapperProvider.java index c1a7cb5..a26f9c5 100644 --- a/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/json/JerseyMonitoringObjectMapperProvider.java +++ b/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/json/JerseyMonitoringObjectMapperProvider.java @@ -5,9 +5,9 @@ import com.coreoz.plume.jersey.jackson.ObjectMapperProvider; import com.fasterxml.jackson.databind.ObjectMapper; -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 java.util.concurrent.TimeUnit; @Singleton diff --git a/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/utils/health/HealthCheckBuilder.java b/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/utils/health/HealthCheckBuilder.java index 9b5b30b..44e7b79 100644 --- a/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/utils/health/HealthCheckBuilder.java +++ b/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/utils/health/HealthCheckBuilder.java @@ -6,7 +6,7 @@ import com.codahale.metrics.health.HealthCheckRegistry; import com.coreoz.plume.jersey.monitoring.utils.health.healthchecks.DatabaseHealthCheck; -import javax.inject.Provider; +import jakarta.inject.Provider; import java.util.SortedMap; public class HealthCheckBuilder { diff --git a/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/utils/metrics/MetricsCheckBuilder.java b/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/utils/metrics/MetricsCheckBuilder.java index 88db257..5856e5e 100644 --- a/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/utils/metrics/MetricsCheckBuilder.java +++ b/plume-web-jersey-monitoring/src/main/java/com/coreoz/plume/jersey/monitoring/utils/metrics/MetricsCheckBuilder.java @@ -6,7 +6,7 @@ import com.codahale.metrics.jvm.MemoryUsageGaugeSet; import com.codahale.metrics.jvm.ThreadStatesGaugeSet; -import javax.inject.Provider; +import jakarta.inject.Provider; import java.util.Map; public class MetricsCheckBuilder { diff --git a/plume-web-jersey/pom.xml b/plume-web-jersey/pom.xml index 7c1aeb2..b62ee5d 100644 --- a/plume-web-jersey/pom.xml +++ b/plume-web-jersey/pom.xml @@ -5,7 +5,7 @@ com.coreoz plume-parent - 4.2.5-SNAPSHOT + 4.2.4-SNAPSHOT plume-web-jersey @@ -20,8 +20,8 @@ - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider + com.fasterxml.jackson.jakarta.rs + jackson-jakarta-rs-json-provider com.fasterxml.jackson.core diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/async/AsyncJersey.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/async/AsyncJersey.java index 777d914..6f362ce 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/async/AsyncJersey.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/async/AsyncJersey.java @@ -3,7 +3,7 @@ import java.util.concurrent.CompletableFuture; import java.util.function.BiConsumer; -import javax.ws.rs.container.AsyncResponse; +import jakarta.ws.rs.container.AsyncResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/dagger/DaggerJacksonModule.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/dagger/DaggerJacksonModule.java index 62ee4ef..19ea436 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/dagger/DaggerJacksonModule.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/dagger/DaggerJacksonModule.java @@ -5,7 +5,7 @@ import dagger.Module; import dagger.Provides; -import javax.inject.Singleton; +import jakarta.inject.Singleton; @Module public class DaggerJacksonModule { diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/WsJacksonJsonProvider.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/WsJacksonJsonProvider.java index b06285c..1b7a5ce 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/WsJacksonJsonProvider.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/WsJacksonJsonProvider.java @@ -12,8 +12,8 @@ import org.slf4j.LoggerFactory; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.jaxrs.cfg.Annotations; -import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; +import com.fasterxml.jackson.jakarta.rs.cfg.Annotations; +import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; /** * A Jackson JSON provider that throws a {@link JsonRequestParseException} @@ -21,7 +21,7 @@ * It is useful to return proper 400 errors when JSON request input is not valid * @see JacksonJaxbJsonProvider */ -public class WsJacksonJsonProvider extends JacksonJaxbJsonProvider { +public class WsJacksonJsonProvider extends JacksonJsonProvider { private static final Logger logger = LoggerFactory.getLogger(WsJacksonJsonProvider.class); diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/jackson/ObjectMapperProvider.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/jackson/ObjectMapperProvider.java index 5121833..eb63e81 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/jackson/ObjectMapperProvider.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/jackson/ObjectMapperProvider.java @@ -1,8 +1,8 @@ package com.coreoz.plume.jersey.jackson; -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 com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/java8/LocalDateConverter.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/java8/LocalDateConverter.java index c839481..63c219e 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/java8/LocalDateConverter.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/java8/LocalDateConverter.java @@ -2,7 +2,7 @@ import java.time.LocalDate; -import javax.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pom.xml b/pom.xml index 642aecf..8eb5b32 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.coreoz plume-parent - 4.2.5-SNAPSHOT + 4.2.4-SNAPSHOT pom Plume Parent From afa606a649789c7a146b1d3dcc919e19b35345c8 Mon Sep 17 00:00:00 2001 From: Benoit Vasseur Date: Thu, 5 Sep 2024 10:36:30 +0200 Subject: [PATCH 4/6] update guice bridge and exclude javax.inject from non updated dependencies --- plume-db-querydsl-codegen/pom.xml | 8 +++++++- plume-db-test/pom.xml | 6 +++++- plume-framework-dependencies/pom.xml | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/plume-db-querydsl-codegen/pom.xml b/plume-db-querydsl-codegen/pom.xml index d1825d9..3d7b253 100644 --- a/plume-db-querydsl-codegen/pom.xml +++ b/plume-db-querydsl-codegen/pom.xml @@ -22,6 +22,12 @@ com.querydsl querydsl-sql-codegen + + + javax.inject + javax.inject + + @@ -43,4 +49,4 @@ - \ No newline at end of file + diff --git a/plume-db-test/pom.xml b/plume-db-test/pom.xml index 9e2b773..435912c 100644 --- a/plume-db-test/pom.xml +++ b/plume-db-test/pom.xml @@ -51,6 +51,10 @@ guice com.google.inject + + javax.inject + javax.inject + @@ -67,4 +71,4 @@ - \ No newline at end of file + diff --git a/plume-framework-dependencies/pom.xml b/plume-framework-dependencies/pom.xml index 4d9d280..93b5537 100644 --- a/plume-framework-dependencies/pom.xml +++ b/plume-framework-dependencies/pom.xml @@ -32,7 +32,7 @@ 2.17.2 3.1.8 2.2.20 - 2.6.1 + 3.1.1 1.8.0 3.0.0 4.1.2 From 6c8fd13b27a6ff215d70ec93714f940cd8f3cc63 Mon Sep 17 00:00:00 2001 From: Benoit Vasseur Date: Wed, 18 Sep 2024 18:45:03 +0200 Subject: [PATCH 5/6] fix querydsl javax exclusion --- plume-db-querydsl-codegen/pom.xml | 6 ------ plume-framework-dependencies/pom.xml | 2 +- .../java/com/coreoz/plume/jersey/errors/Validators.java | 5 +++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/plume-db-querydsl-codegen/pom.xml b/plume-db-querydsl-codegen/pom.xml index 3d7b253..bef2a6f 100644 --- a/plume-db-querydsl-codegen/pom.xml +++ b/plume-db-querydsl-codegen/pom.xml @@ -22,12 +22,6 @@ com.querydsl querydsl-sql-codegen - - - javax.inject - javax.inject - - diff --git a/plume-framework-dependencies/pom.xml b/plume-framework-dependencies/pom.xml index 41a1f1c..8d0970f 100644 --- a/plume-framework-dependencies/pom.xml +++ b/plume-framework-dependencies/pom.xml @@ -16,7 +16,7 @@ 2.3.0 7.0.0 - 2.43.2 + 2.52 32.1.1-jre 2.0.1 1.18.34 diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/Validators.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/Validators.java index cbb3280..c6fb548 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/Validators.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/Validators.java @@ -3,8 +3,9 @@ import org.apache.commons.validator.routines.EmailValidator; import com.google.common.base.Strings; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; + +import jakarta.annotation.Nullable; +import jakarta.validation.constraints.NotNull; import java.util.List; From 9d5733c41e636dfd914af75f7f79f2ca0767f2fd Mon Sep 17 00:00:00 2001 From: Benoit Vasseur Date: Wed, 18 Sep 2024 18:58:19 +0200 Subject: [PATCH 6/6] Fix Nonnull annotation in Validators --- .../com/coreoz/plume/jersey/errors/Validators.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/Validators.java b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/Validators.java index c6fb548..af862a8 100644 --- a/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/Validators.java +++ b/plume-web-jersey/src/main/java/com/coreoz/plume/jersey/errors/Validators.java @@ -4,8 +4,8 @@ import com.google.common.base.Strings; +import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; -import jakarta.validation.constraints.NotNull; import java.util.List; @@ -14,42 +14,42 @@ * when the input data does not pass the validator. */ public class Validators { - public static @NotNull T checkRequired(@Nullable T parameter) { + public static @Nonnull T checkRequired(@Nullable T parameter) { if(parameter == null) { throw new WsException(WsError.FIELD_REQUIRED); } return parameter; } - public static @NotNull String checkRequired(@NotNull String fieldName, @Nullable String fieldValue) { + public static @Nonnull String checkRequired(@Nonnull String fieldName, @Nullable String fieldValue) { if(Strings.isNullOrEmpty(fieldValue)) { throw new WsException(WsError.FIELD_REQUIRED, List.of(fieldName)); } return fieldValue; } - public static @NotNull T checkRequired(@NotNull String fieldName, @Nullable T fieldValue) { + public static @Nonnull T checkRequired(@Nonnull String fieldName, @Nullable T fieldValue) { if(fieldValue == null) { throw new WsException(WsError.FIELD_REQUIRED, List.of(fieldName)); } return fieldValue; } - public static @Nullable String checkEmail(@NotNull String fieldName, @Nullable String fieldValue) { + public static @Nullable String checkEmail(@Nonnull String fieldName, @Nullable String fieldValue) { if(!EmailValidator.getInstance().isValid(fieldValue)) { throw new WsException(WsError.EMAIL_INVALID, List.of(fieldName)); } return fieldValue; } - public static @Nullable String checkHexaColor(@NotNull String fieldName, @Nullable String fieldValue) { + public static @Nullable String checkHexaColor(@Nonnull String fieldName, @Nullable String fieldValue) { if(fieldValue != null && !fieldValue.matches("[0-9a-fA-F]{6}")) { throw new WsException(WsError.COLOR_INVALID, List.of(fieldName)); } return fieldValue; } - public static @Nullable String checkHexaColorWithStartingHash(@NotNull String fieldName, @Nullable String fieldValue) { + public static @Nullable String checkHexaColorWithStartingHash(@Nonnull String fieldName, @Nullable String fieldValue) { if(fieldValue != null) { if (!fieldValue.startsWith("#")) { throw new WsException(WsError.COLOR_INVALID, List.of(fieldName));