From 6c63ecccf9bd0d62a3f60369560a754b4e248dc1 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 2 Feb 2023 00:02:32 +0100 Subject: [PATCH] upgrade jakarta --- back/src/org/kar/karanage/WebLauncher.java | 2 +- back/src/org/kar/karanage/api/Front.java | 10 +++++----- back/src/org/kar/karanage/api/HealthCheck.java | 6 +++--- back/src/org/kar/karanage/api/LogResource.java | 6 +++--- .../src/org/kar/karanage/api/StateHistoryResource.java | 6 +++--- back/src/org/kar/karanage/api/StateResource.java | 6 +++--- back/src/org/kar/karanage/api/UserResource.java | 8 ++++---- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/back/src/org/kar/karanage/WebLauncher.java b/back/src/org/kar/karanage/WebLauncher.java index 19f7c3c..7915bfb 100755 --- a/back/src/org/kar/karanage/WebLauncher.java +++ b/back/src/org/kar/karanage/WebLauncher.java @@ -2,7 +2,7 @@ package org.kar.karanage; import java.net.URI; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.glassfish.grizzly.http.server.HttpServer; import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory; diff --git a/back/src/org/kar/karanage/api/Front.java b/back/src/org/kar/karanage/api/Front.java index b7018cd..2fc76fe 100644 --- a/back/src/org/kar/karanage/api/Front.java +++ b/back/src/org/kar/karanage/api/Front.java @@ -4,11 +4,11 @@ import java.io.File; import java.util.List; import org.kar.archidata.annotation.security.PermitAll; -import javax.ws.rs.*; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.PathSegment; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.PathSegment; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; import org.kar.archidata.api.FrontGeneric; import org.kar.karanage.util.ConfigVariable; diff --git a/back/src/org/kar/karanage/api/HealthCheck.java b/back/src/org/kar/karanage/api/HealthCheck.java index a5d0f68..aa04a31 100644 --- a/back/src/org/kar/karanage/api/HealthCheck.java +++ b/back/src/org/kar/karanage/api/HealthCheck.java @@ -1,9 +1,9 @@ package org.kar.karanage.api; import org.kar.archidata.annotation.security.PermitAll; -import javax.ws.rs.core.Response; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; import org.kar.archidata.util.JWTWrapper; diff --git a/back/src/org/kar/karanage/api/LogResource.java b/back/src/org/kar/karanage/api/LogResource.java index 129725b..a2c306a 100644 --- a/back/src/org/kar/karanage/api/LogResource.java +++ b/back/src/org/kar/karanage/api/LogResource.java @@ -6,7 +6,7 @@ import org.kar.archidata.WhereCondition; import org.kar.karanage.model.DataLog; import org.kar.karanage.model.Group; import org.kar.karanage.model.MultipleLogElement; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.kar.archidata.annotation.SQLComment; import org.kar.archidata.annotation.SQLCreateTime; @@ -23,8 +23,8 @@ import org.kar.archidata.db.DBEntry; import org.kar.archidata.exception.FailException; import org.kar.archidata.exception.InputException; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; import java.lang.reflect.Field; import java.sql.PreparedStatement; diff --git a/back/src/org/kar/karanage/api/StateHistoryResource.java b/back/src/org/kar/karanage/api/StateHistoryResource.java index 653c93c..e94a935 100644 --- a/back/src/org/kar/karanage/api/StateHistoryResource.java +++ b/back/src/org/kar/karanage/api/StateHistoryResource.java @@ -5,15 +5,15 @@ import org.kar.archidata.WhereCondition; import org.kar.karanage.model.StateInstant; import org.kar.karanage.model.StateHistory; import org.kar.karanage.model.Group; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.kar.archidata.annotation.security.PermitAll; import org.kar.archidata.exception.FailException; import org.kar.archidata.exception.InputException; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; import java.sql.Timestamp; import java.time.Instant; diff --git a/back/src/org/kar/karanage/api/StateResource.java b/back/src/org/kar/karanage/api/StateResource.java index b7bf45c..3f19a83 100644 --- a/back/src/org/kar/karanage/api/StateResource.java +++ b/back/src/org/kar/karanage/api/StateResource.java @@ -5,15 +5,15 @@ import org.kar.archidata.WhereCondition; import org.kar.karanage.model.StateInstant; import org.kar.karanage.model.StateHistory; import org.kar.karanage.model.Group; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.kar.archidata.annotation.security.PermitAll; import org.kar.archidata.exception.FailException; import org.kar.archidata.exception.InputException; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; import java.sql.Timestamp; import java.time.Instant; diff --git a/back/src/org/kar/karanage/api/UserResource.java b/back/src/org/kar/karanage/api/UserResource.java index ecad9ad..10319da 100755 --- a/back/src/org/kar/karanage/api/UserResource.java +++ b/back/src/org/kar/karanage/api/UserResource.java @@ -6,10 +6,10 @@ import org.kar.karanage.model.UserKaranage; import org.kar.archidata.SqlWrapper; import org.kar.archidata.annotation.security.RolesAllowed; -import javax.ws.rs.*; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.SecurityContext; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.SecurityContext; import java.util.List;