diff --git a/src/client-toolchain/pom.xml b/src/client-toolchain/pom.xml index b4cd2375..e8971c66 100644 --- a/src/client-toolchain/pom.xml +++ b/src/client-toolchain/pom.xml @@ -19,7 +19,7 @@ 1.8.20 6.0.0-SNAPSHOT - 2.35 + 3.1.5 1.6.4 @@ -65,7 +65,7 @@ org.slf4j slf4j-simple - 1.7.33 + 1.7.36 runtime @@ -75,8 +75,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/src/client-toolchain/src/main/kotlin/co/oslc/refimpl/client/Main.kt b/src/client-toolchain/src/main/kotlin/co/oslc/refimpl/client/Main.kt index deae6bf3..42a123ba 100644 --- a/src/client-toolchain/src/main/kotlin/co/oslc/refimpl/client/Main.kt +++ b/src/client-toolchain/src/main/kotlin/co/oslc/refimpl/client/Main.kt @@ -27,8 +27,8 @@ import java.net.ConnectException import java.net.URI import java.util.* import javax.net.ssl.SSLContext -import javax.ws.rs.client.ClientBuilder -import javax.ws.rs.core.Response +import jakarta.ws.rs.client.ClientBuilder +import jakarta.ws.rs.core.Response import kotlin.collections.HashSet import kotlin.system.measureNanoTime diff --git a/src/lib-common/pom.xml b/src/lib-common/pom.xml index 377ceba2..242b2314 100644 --- a/src/lib-common/pom.xml +++ b/src/lib-common/pom.xml @@ -21,7 +21,8 @@ 6.0.0-SNAPSHOT - 2.35 + 6.0.0 + 3.1.5 @@ -39,7 +40,7 @@ org.slf4j slf4j-simple - 1.7.33 + 1.7.36 runtime @@ -77,8 +78,8 @@ ${version.jersey} - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api @@ -88,15 +89,15 @@ ${version.jersey} - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + ${v.jakarta.servlet.api} provided @@ -106,9 +107,9 @@ provided - javax.ws.rs - javax.ws.rs-api - 2.0.1 + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 provided diff --git a/src/lib-common/src/main/java/co/oslc/refimpl/lib/MemResourceRepository.java b/src/lib-common/src/main/java/co/oslc/refimpl/lib/MemResourceRepository.java index 897a35a6..cf190cb3 100644 --- a/src/lib-common/src/main/java/co/oslc/refimpl/lib/MemResourceRepository.java +++ b/src/lib-common/src/main/java/co/oslc/refimpl/lib/MemResourceRepository.java @@ -9,9 +9,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; -import javax.xml.bind.DatatypeConverter; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.xml.bind.DatatypeConverter; import javax.xml.datatype.DatatypeConfigurationException; import java.io.StringWriter; import java.lang.reflect.InvocationTargetException; diff --git a/src/server-rm/pom.xml b/src/server-rm/pom.xml index 79741c79..0badb2fd 100644 --- a/src/server-rm/pom.xml +++ b/src/server-rm/pom.xml @@ -20,8 +20,9 @@ 17 17 6.0.0-SNAPSHOT - 2.35 - 2.2.7 + 6.0.0 + 3.1.5 + 2.2.20 3.52.5 8800 / @@ -140,9 +141,9 @@ - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + ${v.jakarta.servlet.api} provided @@ -195,7 +196,7 @@ org.glassfish.jaxb jaxb-runtime - 4.0.2 + 4.0.5 runtime @@ -244,7 +245,7 @@ io.swagger.core.v3 - swagger-jaxrs2 + swagger-jaxrs2-jakarta ${swagger.version} @@ -256,7 +257,7 @@ io.swagger.core.v3 - swagger-jaxrs2-servlet-initializer-v2 + swagger-jaxrs2-servlet-initializer-v2-jakarta ${swagger.version} - org.eclipse.jetty - jetty-maven-plugin - 10.0.7 + org.eclipse.jetty.ee10 + jetty-ee10-maven-plugin + 12.0.7 ${application.contextpath} diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/ResourcesFactory.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/ResourcesFactory.java index 18cae8c9..460ff78a 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/ResourcesFactory.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/ResourcesFactory.java @@ -24,7 +24,7 @@ import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.eclipse.lyo.oslc4j.core.model.Link; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/RestDelegate.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/RestDelegate.java index f07b4c37..6aefb7e3 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/RestDelegate.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/RestDelegate.java @@ -25,9 +25,9 @@ package co.oslc.refimpl.rm.gen; -import javax.inject.Inject; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.ServletContextEvent; +import jakarta.inject.Inject; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletContextEvent; import java.util.List; import java.util.ArrayList; import org.slf4j.Logger; @@ -57,8 +57,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/auth/AuthenticationApplication.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/auth/AuthenticationApplication.java index 7e862b63..3b355b30 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/auth/AuthenticationApplication.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/auth/AuthenticationApplication.java @@ -22,9 +22,9 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/clients/GenericRequiredAdaptorClient.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/clients/GenericRequiredAdaptorClient.java index 3dc171d8..6f4ff11b 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/clients/GenericRequiredAdaptorClient.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/clients/GenericRequiredAdaptorClient.java @@ -19,7 +19,7 @@ package co.oslc.refimpl.rm.gen.clients; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.eclipse.lyo.client.OSLCConstants; import org.eclipse.lyo.client.OslcClient; import org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog; diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/Requirement_collectionsService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/Requirement_collectionsService.java index c3838f5e..efcbfeb1 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/Requirement_collectionsService.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/Requirement_collectionsService.java @@ -36,30 +36,30 @@ import java.util.Set; import java.util.TreeSet; -import javax.inject.Inject; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.core.UriBuilder; +import jakarta.inject.Inject; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriBuilder; import org.apache.wink.json4j.JSONException; import org.apache.wink.json4j.JSONObject; diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RequirementsService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RequirementsService.java index f5243b42..ec12f804 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RequirementsService.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RequirementsService.java @@ -36,30 +36,30 @@ import java.util.Set; import java.util.TreeSet; -import javax.inject.Inject; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.core.UriBuilder; +import jakarta.inject.Inject; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriBuilder; import org.apache.wink.json4j.JSONException; import org.apache.wink.json4j.JSONObject; diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ResourceShapeService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ResourceShapeService.java index aac16dbd..91a946fa 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ResourceShapeService.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ResourceShapeService.java @@ -28,20 +28,20 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriInfo; import org.eclipse.lyo.oslc4j.core.model.OslcConstants; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; @@ -64,7 +64,7 @@ public class ResourceShapeService @Context private HttpServletRequest httpServletRequest; @Context private HttpServletResponse httpServletResponse; @Context private UriInfo uriInfo; - @Context private javax.ws.rs.core.Application jaxrsApplication; + @Context private jakarta.ws.rs.core.Application jaxrsApplication; private static final Logger log = LoggerFactory.getLogger(ResourceShapeService.class.getName()); diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RootServicesService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RootServicesService.java index 92c00f7d..4c053768 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RootServicesService.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/RootServicesService.java @@ -16,17 +16,17 @@ package co.oslc.refimpl.rm.gen.services; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.eclipse.lyo.oslc4j.core.model.OslcMediaType; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; import co.oslc.refimpl.rm.gen.ServerConstants; diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderCatalogService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderCatalogService.java index ebdee6e2..3babf315 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderCatalogService.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderCatalogService.java @@ -29,19 +29,19 @@ import java.net.URI; import java.net.URISyntaxException; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.core.Response; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.Response; import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog; import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability; diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderService.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderService.java index d2b6f417..936a59c9 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderService.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/ServiceProviderService.java @@ -27,18 +27,18 @@ import java.io.IOException; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; import org.eclipse.lyo.oslc4j.core.annotation.OslcDialog; import org.eclipse.lyo.oslc4j.core.annotation.OslcQueryCapability; diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/WebServiceBasic.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/WebServiceBasic.java index f7211956..634cc9df 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/WebServiceBasic.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/services/WebServiceBasic.java @@ -36,30 +36,30 @@ import java.util.Set; import java.util.TreeSet; -import javax.inject.Inject; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.core.UriBuilder; +import jakarta.inject.Inject; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.UriBuilder; import org.apache.wink.json4j.JSONException; import org.apache.wink.json4j.JSONObject; diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java index 6f479020..fcb4a61d 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/Application.java @@ -30,7 +30,7 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.hk2.utilities.ServiceLocatorUtilities; @@ -88,7 +88,7 @@ */ @OpenAPIDefinition(info = @Info(title = "RM", version = "1.0.0"), servers = @Server(url = "/services/")) -public class Application extends javax.ws.rs.core.Application { +public class Application extends jakarta.ws.rs.core.Application { private static final Set> RESOURCE_CLASSES = new HashSet>(); private static final Map> RESOURCE_SHAPE_PATH_TO_RESOURCE_CLASS_MAP = new HashMap>(); diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ApplicationBinder.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ApplicationBinder.java index 40e7bbfd..3db0a686 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ApplicationBinder.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ApplicationBinder.java @@ -22,7 +22,7 @@ import org.glassfish.hk2.api.Factory; import org.glassfish.hk2.utilities.binding.AbstractBinder; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import co.oslc.refimpl.rm.gen.RestDelegate; import co.oslc.refimpl.rm.gen.ResourcesFactory; diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/CredentialsFilter.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/CredentialsFilter.java index 8fef7ea4..730b26af 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/CredentialsFilter.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/CredentialsFilter.java @@ -24,15 +24,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import net.oauth.OAuth; import net.oauth.OAuthException; import net.oauth.OAuthMessage; diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProviderCatalogSingleton.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProviderCatalogSingleton.java index 5a37a471..20c2ed21 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProviderCatalogSingleton.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProviderCatalogSingleton.java @@ -34,10 +34,10 @@ import java.util.TreeMap; import java.util.TreeSet; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriBuilder; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilder; import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; import org.eclipse.lyo.oslc4j.core.model.Service; diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProvidersFactory.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProvidersFactory.java index e9355582..6ea3bfe6 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProvidersFactory.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServiceProvidersFactory.java @@ -33,7 +33,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException; import org.eclipse.lyo.oslc4j.core.model.OslcConstants; diff --git a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServletListener.java b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServletListener.java index 7d754c81..2fd4448a 100644 --- a/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServletListener.java +++ b/src/server-rm/src/main/java/co/oslc/refimpl/rm/gen/servlet/ServletListener.java @@ -31,11 +31,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletRegistration; -import javax.ws.rs.core.UriBuilder; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.ServletRegistration; +import jakarta.ws.rs.core.UriBuilder; import org.eclipse.lyo.oslc4j.core.OSLC4JUtils; import co.oslc.refimpl.rm.gen.RestDelegate; diff --git a/src/server-rm/src/main/webapp/WEB-INF/web.xml b/src/server-rm/src/main/webapp/WEB-INF/web.xml index 77903237..9f1f091e 100644 --- a/src/server-rm/src/main/webapp/WEB-INF/web.xml +++ b/src/server-rm/src/main/webapp/WEB-INF/web.xml @@ -32,7 +32,7 @@ JAX-RS Servlet org.glassfish.jersey.servlet.ServletContainer - javax.ws.rs.Application + jakarta.ws.rs.Application co.oslc.refimpl.rm.gen.servlet.Application 1 diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/creationdialogsampleclient.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/creationdialogsampleclient.jsp index 5fb106cb..323ce3a6 100644 --- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/creationdialogsampleclient.jsp +++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/creationdialogsampleclient.jsp @@ -16,7 +16,7 @@ This file is generated by Lyo Designer (https://www.eclipse.org/lyo/) --%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %> <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %> diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirement.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirement.jsp index 93e6d246..061785c6 100644 --- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirement.jsp +++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirement.jsp @@ -33,7 +33,7 @@ <%@page import="java.util.Iterator"%> <%@page import="java.util.Map"%> <%@page import="javax.xml.namespace.QName"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc.domains.rm.Requirement"%> <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%> diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollection.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollection.jsp index e81ab501..145127e8 100644 --- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollection.jsp +++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollection.jsp @@ -33,7 +33,7 @@ <%@page import="java.util.Iterator"%> <%@page import="java.util.Map"%> <%@page import="javax.xml.namespace.QName"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc.domains.rm.RequirementCollection"%> <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%> diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionlargepreview.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionlargepreview.jsp index 139bfb4c..0e7d0a7c 100644 --- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionlargepreview.jsp +++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionlargepreview.jsp @@ -33,7 +33,7 @@ <%@page import="java.util.Iterator"%> <%@page import="java.util.Map"%> <%@page import="javax.xml.namespace.QName"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc.domains.rm.RequirementCollection"%> <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%> diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionscollection.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionscollection.jsp index 7f5be65e..ab9a63ec 100644 --- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionscollection.jsp +++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionscollection.jsp @@ -18,7 +18,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%> <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%> diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionselector.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionselector.jsp index 7733b298..b6b8a394 100644 --- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionselector.jsp +++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionselector.jsp @@ -21,7 +21,7 @@ <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%> <%@page import="org.eclipse.lyo.oslc.domains.rm.RequirementCollection"%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %> diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionsmallpreview.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionsmallpreview.jsp index 5b9e807c..c7db85ff 100644 --- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionsmallpreview.jsp +++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcollectionsmallpreview.jsp @@ -33,7 +33,7 @@ <%@page import="java.util.Iterator"%> <%@page import="java.util.Map"%> <%@page import="javax.xml.namespace.QName"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc.domains.rm.RequirementCollection"%> <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%> diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcreator.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcreator.jsp index f79aa84a..5a4a0388 100644 --- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcreator.jsp +++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementcreator.jsp @@ -22,7 +22,7 @@ <%@page import="java.util.List" %> <%@page import="org.eclipse.lyo.oslc.domains.rm.Requirement"%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %> diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementlargepreview.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementlargepreview.jsp index a7c8c4fd..155166ba 100644 --- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementlargepreview.jsp +++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementlargepreview.jsp @@ -33,7 +33,7 @@ <%@page import="java.util.Iterator"%> <%@page import="java.util.Map"%> <%@page import="javax.xml.namespace.QName"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc.domains.rm.Requirement"%> <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%> diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementscollection.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementscollection.jsp index 652cd7d2..d6e053c5 100644 --- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementscollection.jsp +++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementscollection.jsp @@ -18,7 +18,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%> <%@page import="org.eclipse.lyo.oslc4j.core.model.AbstractResource"%> diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementselector.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementselector.jsp index 203f1fba..642dafab 100644 --- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementselector.jsp +++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementselector.jsp @@ -21,7 +21,7 @@ <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%> <%@page import="org.eclipse.lyo.oslc.domains.rm.Requirement"%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %> diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementsmallpreview.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementsmallpreview.jsp index 91794441..3938d516 100644 --- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementsmallpreview.jsp +++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/requirementsmallpreview.jsp @@ -33,7 +33,7 @@ <%@page import="java.util.Iterator"%> <%@page import="java.util.Map"%> <%@page import="javax.xml.namespace.QName"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc.domains.rm.Requirement"%> <%@page import="org.eclipse.lyo.oslc.domains.rm.Oslc_rmDomainConstants"%> diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/resourceshape.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/resourceshape.jsp index ccec869f..b2b44427 100644 --- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/resourceshape.jsp +++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/resourceshape.jsp @@ -21,7 +21,7 @@ <%@page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape"%> <%@page import="org.eclipse.lyo.oslc4j.core.model.Property"%> <%@page import="org.eclipse.lyo.oslc4j.core.model.OslcConstants"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %> diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/selectiondialogsampleclient.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/selectiondialogsampleclient.jsp index 245d1430..3b02cab6 100644 --- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/selectiondialogsampleclient.jsp +++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/selectiondialogsampleclient.jsp @@ -16,7 +16,7 @@ This file is generated by Lyo Designer (https://www.eclipse.org/lyo/) --%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> <%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %> <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %> diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovider.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovider.jsp index b1f52c54..1d37790f 100644 --- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovider.jsp +++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovider.jsp @@ -26,7 +26,7 @@ <%@ page import="org.eclipse.lyo.oslc4j.core.model.CreationFactory" %> <%@ page import="org.eclipse.lyo.oslc4j.core.model.ResourceShape" %> <%@ page import="org.eclipse.lyo.oslc4j.core.model.QueryCapability" %> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %> diff --git a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovidercatalog.jsp b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovidercatalog.jsp index 0c167a01..bd24efa2 100644 --- a/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovidercatalog.jsp +++ b/src/server-rm/src/main/webapp/co/oslc/refimpl/rm/gen/serviceprovidercatalog.jsp @@ -18,7 +18,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProviderCatalog" %> <%@ page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider" %> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> <%@ page contentType="text/html" language="java" pageEncoding="UTF-8" %> diff --git a/src/server-rm/src/main/webapp/index.jsp b/src/server-rm/src/main/webapp/index.jsp index 02b0ad18..37359b0e 100644 --- a/src/server-rm/src/main/webapp/index.jsp +++ b/src/server-rm/src/main/webapp/index.jsp @@ -16,7 +16,7 @@ --%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="java.net.URI"%> <%@ page language="java" contentType="text/html; charset=UTF-8" diff --git a/src/server-rm/src/main/webapp/swagger-ui/index.jsp b/src/server-rm/src/main/webapp/swagger-ui/index.jsp index d6c9348c..ead8fe5a 100644 --- a/src/server-rm/src/main/webapp/swagger-ui/index.jsp +++ b/src/server-rm/src/main/webapp/swagger-ui/index.jsp @@ -16,7 +16,7 @@ --%> <%@page import="org.eclipse.lyo.oslc4j.core.OSLC4JUtils"%> -<%@page import="javax.ws.rs.core.UriBuilder"%> +<%@page import="jakarta.ws.rs.core.UriBuilder"%> <%@page import="java.net.URI"%> <%@page import="java.io.File"%>