Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Servers migrated to Jakarta #198

Merged
merged 23 commits into from
Apr 5, 2024
Merged

Servers migrated to Jakarta #198

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
72ed7aa
Client and lib-common manual changes.
Jad-el-khoury Mar 20, 2024
4731633
Generated based on latest Lyodesigner with support for migration to
Jad-el-khoury Mar 20, 2024
01958a8
Update jakarta.servlet.jsp.jstl-api version
Jad-el-khoury Mar 21, 2024
470e0b3
Client and lib-common manual changes.
Jad-el-khoury Mar 20, 2024
bdc2f28
Generated based on latest Lyodesigner with support for migration to
Jad-el-khoury Mar 20, 2024
8c148c2
Update jakarta.servlet.jsp.jstl-api version
Jad-el-khoury Mar 21, 2024
bf82f73
Merge branch 'jakarta_generated' of https://github.com/oslc-op/refimp…
Jad-el-khoury Mar 27, 2024
13223b0
updates to run under jetty-maven-plugin as well as cargo-maven3-plugin
Jad-el-khoury Mar 27, 2024
e851a5c
fixing jstl problems.
Jad-el-khoury Mar 28, 2024
400f880
Update based on latest generation.
Jad-el-khoury Mar 28, 2024
403188e
update docker files.
Jad-el-khoury Mar 28, 2024
c959630
Update servers based on latest LyoDesigner generation
Jad-el-khoury Apr 5, 2024
e914de6
build: jakarta-ready docker images for CI
berezovskyi Apr 5, 2024
5a26928
readme update.
Jad-el-khoury Apr 5, 2024
e2903eb
Merge branch 'jakarta_generated' of https://github.com/oslc-op/refimp…
Jad-el-khoury Apr 5, 2024
559ac23
Merge branch 'master' into jakarta_generated
jadelkhoury Apr 5, 2024
3440d41
build: tomcat CI checks
berezovskyi Apr 5, 2024
b0202b0
ci: manual acceptance
berezovskyi Apr 5, 2024
a066034
ci: manual acceptance
berezovskyi Apr 5, 2024
6e1ddc9
ci: manual acceptance
berezovskyi Apr 5, 2024
306c6ed
fix: lib lyo dep
berezovskyi Apr 5, 2024
548b745
fix: kotlin client lyo dep
berezovskyi Apr 5, 2024
63132f3
build: fix tomcat docker ci
berezovskyi Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/client-toolchain/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<v.kotlin>1.8.20</v.kotlin>
<v.lyo>6.0.0-SNAPSHOT</v.lyo>
<!-- <v.lyo.oslc-ui>${v.lyo}</v.lyo.oslc-ui>-->
<v.jersey>2.35</v.jersey>
<v.jersey>3.1.5</v.jersey>
<v.kotlin.coroutines>1.6.4</v.kotlin.coroutines>
</properties>

Expand Down Expand Up @@ -65,7 +65,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.33</version>
<version>1.7.36</version>
<scope>runtime</scope>
</dependency>
<dependency>
Expand All @@ -75,8 +75,8 @@
<exclusions>
<exclusion>
<!-- Jakarta API is used in Lyo Client -->
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions src/client-toolchain/src/main/kotlin/co/oslc/refimpl/client/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
27 changes: 14 additions & 13 deletions src/lib-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@

<version.lyo>6.0.0-SNAPSHOT</version.lyo>
<!-- <version.lyo>5.0.1.CR</version.lyo>-->
<version.jersey>2.35</version.jersey>
<v.jakarta.servlet.api>6.0.0</v.jakarta.servlet.api>
<version.jersey>3.1.5</version.jersey>
</properties>

<repositories>
Expand All @@ -39,7 +40,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.33</version>
<version>1.7.36</version>
<scope>runtime</scope>
</dependency>

Expand Down Expand Up @@ -77,8 +78,8 @@
<version>${version.jersey}</version>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand All @@ -88,27 +89,27 @@
<version>${version.jersey}</version>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${v.jakarta.servlet.api}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>1.2.7</version>
<version>3.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0.1</version>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions src/lib-common/src/main/java/co/oslc/refimpl/lib/MemResourceRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
22 changes: 11 additions & 11 deletions src/server-am/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
<version.lyo>6.0.0-SNAPSHOT</version.lyo>
<jersey.version>2.35</jersey.version>
<swagger.version>2.2.7</swagger.version>
<jersey.version>3.1.5</jersey.version>
<swagger.version>2.2.20</swagger.version>
<swagger-ui.version>3.52.5</swagger-ui.version>
<servlet.port>8803</servlet.port>
<application.contextpath>/</application.contextpath>
Expand Down Expand Up @@ -128,9 +128,9 @@
</dependency>
<!-- Servlet dependencies -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -183,7 +183,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>4.0.2</version>
<version>4.0.5</version>
<scope>runtime</scope>
</dependency>
<!-- Lyo dependencies -->
Expand Down Expand Up @@ -232,7 +232,7 @@
<!-- Swagger dependencies -->
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2</artifactId>
<artifactId>swagger-jaxrs2-jakarta</artifactId>
<version>${swagger.version}</version>
<exclusions>
<exclusion>
Expand All @@ -244,7 +244,7 @@
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2-servlet-initializer-v2</artifactId>
<artifactId>swagger-jaxrs2-servlet-initializer-v2-jakarta</artifactId>
<version>${swagger.version}</version>
</dependency>
<!-- Start of user code dependencies_final
Expand All @@ -266,9 +266,9 @@
<!-- End of user code
-->
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>10.0.7</version>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-maven-plugin</artifactId>
<version>12.0.7</version>
<configuration>
<webApp>
<contextPath>${application.contextpath}</contextPath>
Expand Down
2 changes: 1 addition & 1 deletion src/server-am/src/main/java/co/oslc/refimpl/am/gen/ResourcesFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/server-am/src/main/java/co/oslc/refimpl/am/gen/RestDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
package co.oslc.refimpl.am.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;
Expand All @@ -49,8 +49,8 @@
import java.util.Date;
import java.util.UUID;

import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.Response;

import co.oslc.refimpl.lib.MemResourceRepository;
import co.oslc.refimpl.lib.ResourceRepository;
Expand Down
6 changes: 3 additions & 3 deletions src/server-am/src/main/java/co/oslc/refimpl/am/gen/auth/AuthenticationApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/server-am/src/main/java/co/oslc/refimpl/am/gen/clients/GenericRequiredAdaptorClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package co.oslc.refimpl.am.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;
Expand Down
48 changes: 24 additions & 24 deletions src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/LinksService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
30 changes: 15 additions & 15 deletions src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourceShapeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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());

Expand Down
48 changes: 24 additions & 24 deletions src/server-am/src/main/java/co/oslc/refimpl/am/gen/services/ResourcesService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading