diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b091874ed..d4cd65774 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,10 +9,3 @@ updates: directory: "/" # Location of package manifests schedule: interval: "weekly" - ignore: - - dependency-name: org.apache.cxf:* - versions: - - "> 3, < 4" - - dependency-name: org.eclipse.jetty:* - versions: - - " < 11" diff --git a/document/fr.opensagres.xdocreport.document.tools/pom.xml b/document/fr.opensagres.xdocreport.document.tools/pom.xml index d44928d73..b0ba0a086 100644 --- a/document/fr.opensagres.xdocreport.document.tools/pom.xml +++ b/document/fr.opensagres.xdocreport.document.tools/pom.xml @@ -79,65 +79,65 @@ org.apache.cxf cxf-rt-frontend-jaxws - 3.1.9 + 4.0.4 org.apache.cxf cxf-rt-frontend-jaxrs - 3.1.9 + 4.0.4 org.apache.cxf cxf-rt-rs-client - 3.1.9 + 4.0.4 org.apache.cxf cxf-rt-transports-http-jetty - 3.1.9 + 4.0.4 test - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - 2.6.2 + com.fasterxml.jackson.jakarta.rs + jackson-jakarta-rs-json-provider + 2.13.5 com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.7.8 + 2.13.5 org.eclipse.jetty jetty-webapp - 9.4.53.v20231009 + 11.0.21 test org.eclipse.jetty jetty-util - 9.4.53.v20231009 + 11.0.21 test org.eclipse.jetty jetty-server - 9.4.53.v20231009 + 11.0.21 test org.eclipse.jetty jetty-http - 9.4.53.v20231009 + 11.0.21 test org.eclipse.jetty jetty-io - 9.4.53.v20231009 + 11.0.21 test @@ -149,7 +149,7 @@ com.sun.xml.ws jaxws-rt - 2.3.7 + 3.0.2 pom test diff --git a/document/fr.opensagres.xdocreport.document.tools/src/main/java/fr/opensagres/xdocreport/document/tools/remoting/resources/Main.java b/document/fr.opensagres.xdocreport.document.tools/src/main/java/fr/opensagres/xdocreport/document/tools/remoting/resources/Main.java index 45c1aa8f0..10d6481a0 100644 --- a/document/fr.opensagres.xdocreport.document.tools/src/main/java/fr/opensagres/xdocreport/document/tools/remoting/resources/Main.java +++ b/document/fr.opensagres.xdocreport.document.tools/src/main/java/fr/opensagres/xdocreport/document/tools/remoting/resources/Main.java @@ -34,14 +34,10 @@ import java.io.PrintStream; import java.io.Writer; -import javax.ws.rs.RuntimeType; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Configuration; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; -import org.apache.cxf.jaxrs.impl.ConfigurationImpl; - -import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; +import com.fasterxml.jackson.jakarta.rs.json.JacksonXmlBindJsonProvider; import fr.opensagres.xdocreport.core.io.IOUtils; import fr.opensagres.xdocreport.core.utils.StringUtils; @@ -154,7 +150,7 @@ private static void processJAXRS( String baseAddress, String user, String passwo { String resources = null; Client client = ClientBuilder.newBuilder() - .register(JacksonJaxbJsonProvider.class) + .register(JacksonXmlBindJsonProvider.class) .register(LargeBinaryDataMessageBodyReader.class) .register(LargeBinaryDataMessageBodyWriter.class) .build(); @@ -323,8 +319,9 @@ private static void processDownloadLargeFile( JAXRSResourcesService client, Stri if ( resources.indexOf( ";" ) == -1 ) { - LargeBinaryData data = client.downloadLarge( resources ); - binaryDataContentToFile( new File( out ), data ); + try ( LargeBinaryData data = client.downloadLarge( resources ) ) { + binaryDataContentToFile( new File( out ), data ); + } } else { @@ -345,8 +342,9 @@ private static void processUploadLargeLargeFile( JAXRSResourcesService client, S } if ( resources.indexOf( ";" ) == -1 ) { - LargeBinaryData data = createLargeBinaryDataFromFile( resources, new File( out ) ); - client.uploadLarge( data ); + try ( LargeBinaryData data = createLargeBinaryDataFromFile( resources, new File( out ) ) ) { + client.uploadLarge(data); + } } else diff --git a/document/fr.opensagres.xdocreport.document.tools/src/main/java/org/json/JSONObject.java b/document/fr.opensagres.xdocreport.document.tools/src/main/java/org/json/JSONObject.java index 0b7a3edec..3bdeec2ec 100644 --- a/document/fr.opensagres.xdocreport.document.tools/src/main/java/org/json/JSONObject.java +++ b/document/fr.opensagres.xdocreport.document.tools/src/main/java/org/json/JSONObject.java @@ -1713,7 +1713,7 @@ public static Object wrap( Object object ) Package objectPackage = object.getClass().getPackage(); String objectPackageName = objectPackage != null ? objectPackage.getName() : ""; if ( objectPackageName.startsWith( "java." ) || objectPackageName.startsWith( "javax." ) - || object.getClass().getClassLoader() == null ) + || objectPackageName.startsWith( "jakarta." ) || object.getClass().getClassLoader() == null ) { return object.toString(); } diff --git a/document/fr.opensagres.xdocreport.document.tools/src/test/java/fr/opensagres/xdocreport/document/tools/remoting/resources/services/server/jaxws/MockCXFNonSpringServlet.java b/document/fr.opensagres.xdocreport.document.tools/src/test/java/fr/opensagres/xdocreport/document/tools/remoting/resources/services/server/jaxws/MockCXFNonSpringServlet.java index 5b2e6d0c6..c230d6e16 100644 --- a/document/fr.opensagres.xdocreport.document.tools/src/test/java/fr/opensagres/xdocreport/document/tools/remoting/resources/services/server/jaxws/MockCXFNonSpringServlet.java +++ b/document/fr.opensagres.xdocreport.document.tools/src/test/java/fr/opensagres/xdocreport/document/tools/remoting/resources/services/server/jaxws/MockCXFNonSpringServlet.java @@ -24,9 +24,9 @@ */ package fr.opensagres.xdocreport.document.tools.remoting.resources.services.server.jaxws; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.xml.ws.Endpoint; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.xml.ws.Endpoint; import org.apache.cxf.transport.servlet.CXFNonSpringServlet; @@ -44,7 +44,7 @@ public void init( ServletConfig sc ) super.init( sc ); String address = "/resources"; Endpoint e = - javax.xml.ws.Endpoint.publish( address, new JAXWSResourcesServiceImpl( new MockResourcesService() ) ); + jakarta.xml.ws.Endpoint.publish( address, new JAXWSResourcesServiceImpl( new MockResourcesService() ) ); System.err.println( e ); } } diff --git a/document/fr.opensagres.xdocreport.document/pom.xml b/document/fr.opensagres.xdocreport.document/pom.xml index 26a9f1ec2..2a6bd4756 100644 --- a/document/fr.opensagres.xdocreport.document/pom.xml +++ b/document/fr.opensagres.xdocreport.document/pom.xml @@ -10,17 +10,23 @@ - + + + org.apache.commons + commons-fileupload2-core + 2.0.0-M2 + true + - commons-fileupload - commons-fileupload - 1.5 + org.apache.commons + commons-fileupload2-jakarta-servlet5 + 2.0.0-M2 true - javax.servlet - servlet-api - 2.5 + jakarta.servlet + jakarta.servlet-api + 5.0.0 true diff --git a/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/json/JSONObject.java b/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/json/JSONObject.java index d1c2a7dc4..93a202c5c 100644 --- a/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/json/JSONObject.java +++ b/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/json/JSONObject.java @@ -1851,7 +1851,7 @@ public static Object wrap( Object object, IJSONNode node ) Package objectPackage = object.getClass().getPackage(); String objectPackageName = objectPackage != null ? objectPackage.getName() : ""; if ( objectPackageName.startsWith( "java." ) || objectPackageName.startsWith( "javax." ) - || object.getClass().getClassLoader() == null ) + || objectPackageName.startsWith( "jakarta." ) || object.getClass().getClassLoader() == null ) { return object.toString(); } diff --git a/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/AbstractProcessXDocReportServlet.java b/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/AbstractProcessXDocReportServlet.java index 18abe3004..735fa1bfc 100644 --- a/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/AbstractProcessXDocReportServlet.java +++ b/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/AbstractProcessXDocReportServlet.java @@ -29,12 +29,13 @@ import java.io.PrintWriter; import java.io.StringWriter; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.xml.transform.URIResolver; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import fr.opensagres.xdocreport.converter.ConverterTypeTo; import fr.opensagres.xdocreport.converter.IConverter; import fr.opensagres.xdocreport.converter.IURIResolver; diff --git a/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/BaseXDocReportServlet.java b/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/BaseXDocReportServlet.java index 2ee0a4779..671122f24 100644 --- a/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/BaseXDocReportServlet.java +++ b/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/BaseXDocReportServlet.java @@ -27,12 +27,12 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import fr.opensagres.xdocreport.converter.MimeMapping; import fr.opensagres.xdocreport.core.utils.HttpHeaderUtils; diff --git a/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/UploadXDocReportServlet.java b/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/UploadXDocReportServlet.java index 70909225f..ba95f504d 100644 --- a/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/UploadXDocReportServlet.java +++ b/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/UploadXDocReportServlet.java @@ -29,15 +29,15 @@ import java.util.Iterator; import java.util.List; -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.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.servlet.ServletFileUpload; +import org.apache.commons.fileupload2.core.DiskFileItem; +import org.apache.commons.fileupload2.core.DiskFileItemFactory; +import org.apache.commons.fileupload2.core.FileItem; +import org.apache.commons.fileupload2.core.FileUploadException; +import org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload; import fr.opensagres.xdocreport.core.XDocReportException; import fr.opensagres.xdocreport.document.IXDocReport; @@ -70,26 +70,25 @@ protected void processRequest( HttpServletRequest request, HttpServletResponse r protected void doUpload( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException { - boolean isMultipart = ServletFileUpload.isMultipartContent( request ); + boolean isMultipart = JakartaServletFileUpload.isMultipartContent( request ); if ( isMultipart ) { // Create a factory for disk-based file items - FileItemFactory factory = new DiskFileItemFactory(); + DiskFileItemFactory factory = DiskFileItemFactory.builder().get(); // Create a new file upload handler - ServletFileUpload upload = new ServletFileUpload( factory ); + JakartaServletFileUpload upload = new JakartaServletFileUpload<>( factory ); // Parse the request try { - @SuppressWarnings( "unchecked" ) - List items = upload.parseRequest( request ); - for ( Iterator iterator = items.iterator(); iterator.hasNext(); ) + List items = upload.parseRequest( request ); + for ( Iterator iterator = items.iterator(); iterator.hasNext(); ) { - FileItem fileItem = (FileItem) iterator.next(); + DiskFileItem fileItem = iterator.next(); if ( "uploadfile".equals( fileItem.getFieldName() ) ) { @@ -126,7 +125,7 @@ protected void reportLoaded( IXDocReport report, HttpServletRequest request ) // Do Nothing } - protected String generateReportId( FileItem fileItem, HttpServletRequest request ) + protected String generateReportId( FileItem fileItem, HttpServletRequest request ) { String reportId = fileItem.getName(); // test if report id has slash (when document is uploaded with IE, diff --git a/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/WEBURIResolver.java b/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/WEBURIResolver.java index e08601717..5f5e3ee47 100644 --- a/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/WEBURIResolver.java +++ b/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/WEBURIResolver.java @@ -24,7 +24,7 @@ */ package fr.opensagres.xdocreport.document.web; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import fr.opensagres.xdocreport.converter.IURIResolver; diff --git a/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/dispatcher/IXDocReportWEBController.java b/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/dispatcher/IXDocReportWEBController.java index 534538c8c..3314cc314 100644 --- a/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/dispatcher/IXDocReportWEBController.java +++ b/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/dispatcher/IXDocReportWEBController.java @@ -24,7 +24,7 @@ */ package fr.opensagres.xdocreport.document.web.dispatcher; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import fr.opensagres.xdocreport.document.IXDocReport; import fr.opensagres.xdocreport.document.dispatcher.IXDocReportController; diff --git a/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/dispatcher/ProcessDispatcherXDocReportServlet.java b/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/dispatcher/ProcessDispatcherXDocReportServlet.java index 52735c191..747fc8412 100644 --- a/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/dispatcher/ProcessDispatcherXDocReportServlet.java +++ b/document/fr.opensagres.xdocreport.document/src/main/java/fr/opensagres/xdocreport/document/web/dispatcher/ProcessDispatcherXDocReportServlet.java @@ -29,9 +29,9 @@ import java.util.ArrayList; import java.util.List; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import fr.opensagres.xdocreport.core.XDocReportException; import fr.opensagres.xdocreport.core.utils.StringUtils; diff --git a/integrationtests/fr.opensagres.xdocreport.osgi.integrationtests/pom.xml b/integrationtests/fr.opensagres.xdocreport.osgi.integrationtests/pom.xml index 892e081db..96a5934b5 100644 --- a/integrationtests/fr.opensagres.xdocreport.osgi.integrationtests/pom.xml +++ b/integrationtests/fr.opensagres.xdocreport.osgi.integrationtests/pom.xml @@ -202,7 +202,7 @@ org.apache.cxf cxf-bundle-minimal - 2.5.2 + 4.0.4 slf4j-api @@ -235,9 +235,9 @@ - javax.inject - javax.inject - 1 + jakarta.inject + jakarta.inject-api + 2.0.1 test diff --git a/integrationtests/fr.opensagres.xdocreport.osgi.integrationtests/src/test/java/fr/opensagres/xdocreport/osgi/integrationtests/ConverterTest.java b/integrationtests/fr.opensagres.xdocreport.osgi.integrationtests/src/test/java/fr/opensagres/xdocreport/osgi/integrationtests/ConverterTest.java index 97f492382..5ba70087a 100644 --- a/integrationtests/fr.opensagres.xdocreport.osgi.integrationtests/src/test/java/fr/opensagres/xdocreport/osgi/integrationtests/ConverterTest.java +++ b/integrationtests/fr.opensagres.xdocreport.osgi.integrationtests/src/test/java/fr/opensagres/xdocreport/osgi/integrationtests/ConverterTest.java @@ -97,7 +97,7 @@ public static Option[] configure() mavenBundle("org.slf4j", "slf4j-simple", "1.6.1").noStart(), - wrappedBundle( mavenBundle( "javax.activation", "activation", "1.1.1" ) ), + wrappedBundle( mavenBundle( "jakarta.activation", "jakarta.activation-api", "2.0.1" ) ), wrappedBundle( mavenBundle( "org.apache.poi", "poi", "5.2.0" ) ), wrappedBundle( mavenBundle( "org.apache.poi", "poi-ooxml", "5.2.0" ) ).exports("org.apache.poi.ooxml","org.apache.poi.openxml4j.opc","org.apache.poi.xwpf.usermodel"), wrappedBundle( mavenBundle( "org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xmlbeans", "2.4.0_5" ) ), diff --git a/remoting/fr.opensagres.xdocreport.remoting.converter.server/pom.xml b/remoting/fr.opensagres.xdocreport.remoting.converter.server/pom.xml index 85d424fca..80f5c2854 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.converter.server/pom.xml +++ b/remoting/fr.opensagres.xdocreport.remoting.converter.server/pom.xml @@ -10,7 +10,7 @@ org.apache.cxf cxf-rt-frontend-jaxrs - 3.1.9 + 4.0.4 provided @@ -34,14 +34,14 @@ org.eclipse.jetty jetty-webapp - 9.4.34.v20201102 + 11.0.21 test org.apache.cxf cxf-rt-transports-http-jetty - 3.1.9 + 4.0.4 test @@ -63,7 +63,7 @@ jakarta.xml.bind jakarta.xml.bind-api - 2.3.3 + 3.0.1 test diff --git a/remoting/fr.opensagres.xdocreport.remoting.converter.server/src/main/java/fr/opensagres/xdocreport/remoting/converter/server/ConverterApplication.java b/remoting/fr.opensagres.xdocreport.remoting.converter.server/src/main/java/fr/opensagres/xdocreport/remoting/converter/server/ConverterApplication.java index 676222ae7..6fa5bc23f 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.converter.server/src/main/java/fr/opensagres/xdocreport/remoting/converter/server/ConverterApplication.java +++ b/remoting/fr.opensagres.xdocreport.remoting.converter.server/src/main/java/fr/opensagres/xdocreport/remoting/converter/server/ConverterApplication.java @@ -27,7 +27,7 @@ import java.util.HashSet; import java.util.Set; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; /** * JAX-RS Application to register the {@link ConverterServiceImpl}. diff --git a/remoting/fr.opensagres.xdocreport.remoting.converter.server/src/main/java/fr/opensagres/xdocreport/remoting/converter/server/ConverterServiceImpl.java b/remoting/fr.opensagres.xdocreport.remoting.converter.server/src/main/java/fr/opensagres/xdocreport/remoting/converter/server/ConverterServiceImpl.java index 1e460467b..ec0cab4d0 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.converter.server/src/main/java/fr/opensagres/xdocreport/remoting/converter/server/ConverterServiceImpl.java +++ b/remoting/fr.opensagres.xdocreport.remoting.converter.server/src/main/java/fr/opensagres/xdocreport/remoting/converter/server/ConverterServiceImpl.java @@ -29,16 +29,16 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.activation.DataSource; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.StreamingOutput; +import jakarta.activation.DataSource; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.StreamingOutput; import org.apache.cxf.jaxrs.ext.multipart.Multipart; diff --git a/remoting/fr.opensagres.xdocreport.remoting.converter/pom.xml b/remoting/fr.opensagres.xdocreport.remoting.converter/pom.xml index 52c3dc62c..bbd587333 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.converter/pom.xml +++ b/remoting/fr.opensagres.xdocreport.remoting.converter/pom.xml @@ -8,9 +8,14 @@ fr.opensagres.xdocreport.remoting.converter - javax.activation - activation - 1.1.1 + jakarta.activation + jakarta.activation-api + 2.0.1 + + + com.sun.activation + jakarta.activation + 2.0.1 diff --git a/remoting/fr.opensagres.xdocreport.remoting.converter/src/main/java/fr/opensagres/xdocreport/remoting/converter/ConverterService.java b/remoting/fr.opensagres.xdocreport.remoting.converter/src/main/java/fr/opensagres/xdocreport/remoting/converter/ConverterService.java index 422d7741a..0e9e831c6 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.converter/src/main/java/fr/opensagres/xdocreport/remoting/converter/ConverterService.java +++ b/remoting/fr.opensagres.xdocreport.remoting.converter/src/main/java/fr/opensagres/xdocreport/remoting/converter/ConverterService.java @@ -24,8 +24,8 @@ */ package fr.opensagres.xdocreport.remoting.converter; -import javax.activation.DataSource; -import javax.ws.rs.core.Response; +import jakarta.activation.DataSource; +import jakarta.ws.rs.core.Response; /** * Document converter REST Web Service API. diff --git a/remoting/fr.opensagres.xdocreport.remoting.reporting.server/pom.xml b/remoting/fr.opensagres.xdocreport.remoting.reporting.server/pom.xml index d0c977051..08c7d379f 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.reporting.server/pom.xml +++ b/remoting/fr.opensagres.xdocreport.remoting.reporting.server/pom.xml @@ -10,7 +10,7 @@ org.apache.cxf cxf-rt-frontend-jaxrs - 3.1.9 + 4.0.4 provided @@ -26,9 +26,14 @@ - javax.activation - activation - 1.1.1 + jakarta.activation + jakarta.activation-api + 2.0.1 + + + com.sun.activation + jakarta.activation + 2.0.1 @@ -63,13 +68,13 @@ org.eclipse.jetty jetty-webapp - 9.4.34.v20201102 + 11.0.21 test org.apache.cxf cxf-rt-transports-http-jetty - 3.1.9 + 4.0.4 test @@ -90,7 +95,7 @@ jakarta.xml.bind jakarta.xml.bind-api - 2.3.3 + 3.0.1 test diff --git a/remoting/fr.opensagres.xdocreport.remoting.reporting.server/src/main/java/fr/opensagres/xdocreport/remoting/reporting/server/ReportingServiceImpl.java b/remoting/fr.opensagres.xdocreport.remoting.reporting.server/src/main/java/fr/opensagres/xdocreport/remoting/reporting/server/ReportingServiceImpl.java index 22e33fdd0..61d793747 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.reporting.server/src/main/java/fr/opensagres/xdocreport/remoting/reporting/server/ReportingServiceImpl.java +++ b/remoting/fr.opensagres.xdocreport.remoting.reporting.server/src/main/java/fr/opensagres/xdocreport/remoting/reporting/server/ReportingServiceImpl.java @@ -31,16 +31,16 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.activation.DataSource; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.StreamingOutput; +import jakarta.activation.DataSource; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.StreamingOutput; import org.apache.cxf.jaxrs.ext.multipart.Multipart; import org.xml.sax.SAXException; diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/pom.xml b/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/pom.xml index b822070ab..848714a4c 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/pom.xml +++ b/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/pom.xml @@ -24,21 +24,21 @@ org.apache.cxf cxf-rt-frontend-jaxrs - 3.1.9 + 4.0.4 true org.apache.cxf cxf-rt-rs-client - 3.1.9 + 4.0.4 true org.apache.cxf cxf-rt-frontend-jaxws - 3.1.9 + 4.0.4 true @@ -55,14 +55,14 @@ org.eclipse.jetty jetty-webapp - 9.4.44.v20210927 + 11.0.21 test com.sun.xml.ws jaxws-rt - 2.3.7 + 3.0.2 pom test diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxrs/JAXRSResourcesServiceClient.java b/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxrs/JAXRSResourcesServiceClient.java index 984f5e670..3a1f317e9 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxrs/JAXRSResourcesServiceClient.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxrs/JAXRSResourcesServiceClient.java @@ -26,10 +26,10 @@ import java.util.List; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; import fr.opensagres.xdocreport.remoting.resources.domain.BinaryData; import fr.opensagres.xdocreport.remoting.resources.domain.Filter; @@ -38,7 +38,6 @@ import fr.opensagres.xdocreport.remoting.resources.services.ResourcesException; import fr.opensagres.xdocreport.remoting.resources.services.ResourcesServiceName; import fr.opensagres.xdocreport.remoting.resources.services.jaxrs.JAXRSResourcesService; -import fr.opensagres.xdocreport.remoting.resources.services.jaxrs.Providers; public class JAXRSResourcesServiceClient implements JAXRSResourcesService { diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxrs/JAXRSResourcesServiceClientFactory.java b/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxrs/JAXRSResourcesServiceClientFactory.java index 863388382..541893094 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxrs/JAXRSResourcesServiceClientFactory.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxrs/JAXRSResourcesServiceClientFactory.java @@ -24,7 +24,7 @@ */ package fr.opensagres.xdocreport.remoting.resources.services.client.jaxrs; -import javax.ws.rs.client.Client; +import jakarta.ws.rs.client.Client; import fr.opensagres.xdocreport.remoting.resources.services.jaxrs.JAXRSResourcesService; diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxws/JAXWSResourcesServiceClient.java b/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxws/JAXWSResourcesServiceClient.java index d660c52e4..c6ef7f01f 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxws/JAXWSResourcesServiceClient.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxws/JAXWSResourcesServiceClient.java @@ -29,8 +29,9 @@ import java.util.logging.Logger; import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.soap.SOAPBinding; + +import jakarta.xml.ws.Service; +import jakarta.xml.ws.soap.SOAPBinding; import org.apache.cxf.configuration.security.AuthorizationPolicy; import org.apache.cxf.endpoint.Client; diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxws/JAXWSResourcesServiceService.java b/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxws/JAXWSResourcesServiceService.java index b2ea06cec..dc19336b0 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxws/JAXWSResourcesServiceService.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxws/JAXWSResourcesServiceService.java @@ -27,10 +27,11 @@ import java.net.URL; import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.WebEndpoint; -import javax.xml.ws.WebServiceClient; -import javax.xml.ws.WebServiceFeature; + +import jakarta.xml.ws.Service; +import jakarta.xml.ws.WebEndpoint; +import jakarta.xml.ws.WebServiceClient; +import jakarta.xml.ws.WebServiceFeature; import fr.opensagres.xdocreport.remoting.resources.services.jaxws.JAXWSResourcesService; @@ -85,7 +86,7 @@ public JAXWSResourcesService getResourcesServicePort() { /** * * @param features - * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. * @return * returns JAXWSResourcesService */ diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/test/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxws/MockCXFNonSpringServlet.java b/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/test/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxws/MockCXFNonSpringServlet.java index 6e85cdd8f..b84c304ad 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/test/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxws/MockCXFNonSpringServlet.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources.services.client/src/test/java/fr/opensagres/xdocreport/remoting/resources/services/client/jaxws/MockCXFNonSpringServlet.java @@ -24,9 +24,9 @@ */ package fr.opensagres.xdocreport.remoting.resources.services.client.jaxws; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.xml.ws.Endpoint; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.xml.ws.Endpoint; import org.apache.cxf.transport.servlet.CXFNonSpringServlet; @@ -48,7 +48,7 @@ public void init( ServletConfig sc ) { super.init( sc ); String address = "/resources"; - Endpoint e= javax.xml.ws.Endpoint.publish( address, + Endpoint e= jakarta.xml.ws.Endpoint.publish( address, new JAXWSResourcesServiceImpl( new MockResourcesService( JAXWSResourcesServiceClientTestCase.resourcesDir ) ) ); diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/TEMPLATE.MF b/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/TEMPLATE.MF index eb31bb5e9..467a2caad 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/TEMPLATE.MF +++ b/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/TEMPLATE.MF @@ -1,2 +1,2 @@ -Import-Package: *,org.codehaus.jackson.jaxrs +Import-Package: *,com.fasterxml.jackson.jakarta.rs Bundle-Activator: fr.opensagres.xdocreport.remoting.resources.services.server.jaxrs.internal.Activator diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/pom.xml b/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/pom.xml index c08099709..d473343b1 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/pom.xml +++ b/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/pom.xml @@ -21,26 +21,31 @@ - javax.servlet - servlet-api - 2.5 + jakarta.servlet + jakarta.servlet-api + 5.0.0 true - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - 2.6.2 + com.fasterxml.jackson.jakarta.rs + jackson-jakarta-rs-json-provider + 2.13.5 com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.7.8 + 2.13.5 - javax.activation - activation - 1.1.1 + jakarta.activation + jakarta.activation-api + 2.0.1 + + + com.sun.activation + jakarta.activation + 2.0.1 diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/jaxrs/JAXRSResourcesApplication.java b/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/jaxrs/JAXRSResourcesApplication.java index 8c02392e3..44bff46cc 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/jaxrs/JAXRSResourcesApplication.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/jaxrs/JAXRSResourcesApplication.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Set; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; import fr.opensagres.xdocreport.remoting.resources.services.ResourcesService; import fr.opensagres.xdocreport.remoting.resources.services.ResourcesServicesRegistry; @@ -48,7 +48,7 @@ public JAXRSResourcesApplication() public Set> getClasses() { HashSet> set = new HashSet>(); - set.add(com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider.class); + set.add(com.fasterxml.jackson.jakarta.rs.json.JacksonXmlBindJsonProvider.class); return set; } diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/jaxrs/internal/Activator.java b/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/jaxrs/internal/Activator.java index 8deee44ea..c1eb85a02 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/jaxrs/internal/Activator.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/jaxrs/internal/Activator.java @@ -29,10 +29,10 @@ import java.util.Hashtable; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/jaxws/JAXWSResourcesServiceImpl.java b/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/jaxws/JAXWSResourcesServiceImpl.java index 927ecdd7c..6d435c5c7 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/jaxws/JAXWSResourcesServiceImpl.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/jaxws/JAXWSResourcesServiceImpl.java @@ -26,7 +26,7 @@ import java.util.List; -import javax.jws.WebService; +import jakarta.jws.WebService; import fr.opensagres.xdocreport.remoting.resources.domain.BinaryData; import fr.opensagres.xdocreport.remoting.resources.domain.Filter; diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/web/WebAppHelper.java b/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/web/WebAppHelper.java index 697df58fd..a17ef6d15 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/web/WebAppHelper.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/web/WebAppHelper.java @@ -26,7 +26,7 @@ import java.io.File; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; public class WebAppHelper { diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/web/WebAppResourcesServiceListener.java b/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/web/WebAppResourcesServiceListener.java index 927223a15..ddd61214f 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/web/WebAppResourcesServiceListener.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources.services.server/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/server/web/WebAppResourcesServiceListener.java @@ -26,9 +26,9 @@ import java.io.File; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import fr.opensagres.xdocreport.remoting.resources.services.ResourcesServicesRegistry; import fr.opensagres.xdocreport.remoting.resources.services.server.file.FileResourcesService; diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources/pom.xml b/remoting/fr.opensagres.xdocreport.remoting.resources/pom.xml index 96d1442fb..6549099e4 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources/pom.xml +++ b/remoting/fr.opensagres.xdocreport.remoting.resources/pom.xml @@ -10,17 +10,17 @@ jakarta.xml.bind jakarta.xml.bind-api - 2.3.3 + 3.0.1 jakarta.xml.ws jakarta.xml.ws-api - 2.3.3 + 3.0.1 jakarta.jws jakarta.jws-api - 2.1.0 + 3.0.0 diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/BinaryData.java b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/BinaryData.java index abce824c5..dc72e8cb6 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/BinaryData.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/BinaryData.java @@ -24,10 +24,10 @@ */ package fr.opensagres.xdocreport.remoting.resources.domain; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/DownloadMultiple.java b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/DownloadMultiple.java index b289db04f..b18c6f54f 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/DownloadMultiple.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/DownloadMultiple.java @@ -27,9 +27,9 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/DownloadMultipleResponse.java b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/DownloadMultipleResponse.java index 68ae2a7ff..c7db4688a 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/DownloadMultipleResponse.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/DownloadMultipleResponse.java @@ -27,10 +27,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/Filter.java b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/Filter.java index fa2d9d497..ed5b4eea0 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/Filter.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/Filter.java @@ -27,10 +27,10 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/LargeBinaryData.java b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/LargeBinaryData.java index 4f1ce31a6..445a3c0a6 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/LargeBinaryData.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/LargeBinaryData.java @@ -32,11 +32,13 @@ package fr.opensagres.xdocreport.remoting.resources.domain; +import java.io.Closeable; +import java.io.IOException; import java.io.InputStream; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** @@ -70,7 +72,7 @@ "mimeType", "resourceId" }) -public class LargeBinaryData { +public class LargeBinaryData implements Closeable { private static final String DEFAULT_MIMETYPE = "application/octet-stream"; protected InputStream content; @@ -191,4 +193,8 @@ public void setResourceId(String value) { this.resourceId = value; } + @Override + public void close() throws IOException { + content.close(); + } } diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/ObjectFactory.java b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/ObjectFactory.java index 27c668074..aaf1827db 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/ObjectFactory.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/ObjectFactory.java @@ -24,11 +24,12 @@ */ package fr.opensagres.xdocreport.remoting.resources.domain; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.annotation.XmlElementDecl; +import jakarta.xml.bind.annotation.XmlRegistry; + /** * This object contains factory methods for each diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/PropertyRepresentation.java b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/PropertyRepresentation.java index 83d07fe41..4a44a246d 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/PropertyRepresentation.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/PropertyRepresentation.java @@ -24,9 +24,9 @@ */ package fr.opensagres.xdocreport.remoting.resources.domain; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/Resource.java b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/Resource.java index 2772144b8..c2794bd9c 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/Resource.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/Resource.java @@ -27,12 +27,12 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; /** *

diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/ResourceType.java b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/ResourceType.java index 2efd887ea..31e1e8b84 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/ResourceType.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/domain/ResourceType.java @@ -24,8 +24,8 @@ */ package fr.opensagres.xdocreport.remoting.resources.domain; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxrs/JAXRSResourcesService.java b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxrs/JAXRSResourcesService.java index f65af05f7..868adbc6d 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxrs/JAXRSResourcesService.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxrs/JAXRSResourcesService.java @@ -24,13 +24,13 @@ */ package fr.opensagres.xdocreport.remoting.resources.services.jaxrs; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import fr.opensagres.xdocreport.remoting.resources.domain.BinaryData; import fr.opensagres.xdocreport.remoting.resources.domain.LargeBinaryData; diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxrs/LargeBinaryDataMessageBodyReader.java b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxrs/LargeBinaryDataMessageBodyReader.java index 457f21f5f..db7fa762b 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxrs/LargeBinaryDataMessageBodyReader.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxrs/LargeBinaryDataMessageBodyReader.java @@ -29,11 +29,11 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.Provider; import fr.opensagres.xdocreport.remoting.resources.domain.BinaryData; import fr.opensagres.xdocreport.remoting.resources.domain.LargeBinaryData; diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxrs/LargeBinaryDataMessageBodyWriter.java b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxrs/LargeBinaryDataMessageBodyWriter.java index 9d59cfa10..18c4ccdb3 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxrs/LargeBinaryDataMessageBodyWriter.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxrs/LargeBinaryDataMessageBodyWriter.java @@ -30,11 +30,11 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import fr.opensagres.xdocreport.remoting.resources.domain.BinaryData; import fr.opensagres.xdocreport.remoting.resources.domain.LargeBinaryData; diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxws/JAXWSResourcesService.java b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxws/JAXWSResourcesService.java index 8d8b940f2..f521ed550 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxws/JAXWSResourcesService.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxws/JAXWSResourcesService.java @@ -24,14 +24,14 @@ */ package fr.opensagres.xdocreport.remoting.resources.services.jaxws; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; +import jakarta.jws.WebMethod; +import jakarta.jws.WebParam; +import jakarta.jws.WebResult; +import jakarta.jws.WebService; +import jakarta.jws.soap.SOAPBinding; +import jakarta.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.ws.RequestWrapper; +import jakarta.xml.ws.ResponseWrapper; import fr.opensagres.xdocreport.remoting.resources.services.ResourcesService; diff --git a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxws/JAXWSResourcesServiceService.java b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxws/JAXWSResourcesServiceService.java index 095e9ad45..4dc76e564 100644 --- a/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxws/JAXWSResourcesServiceService.java +++ b/remoting/fr.opensagres.xdocreport.remoting.resources/src/main/java/fr/opensagres/xdocreport/remoting/resources/services/jaxws/JAXWSResourcesServiceService.java @@ -27,10 +27,11 @@ import java.net.URL; import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import javax.xml.ws.WebEndpoint; -import javax.xml.ws.WebServiceClient; -import javax.xml.ws.WebServiceFeature; + +import jakarta.xml.ws.Service; +import jakarta.xml.ws.WebEndpoint; +import jakarta.xml.ws.WebServiceClient; +import jakarta.xml.ws.WebServiceFeature; /** * This class was generated by Apache CXF 2.6.1 @@ -83,7 +84,7 @@ public JAXWSResourcesService getJAXWSResourcesServicePort() { /** * * @param features - * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. + * A list of {@link jakarta.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the features parameter will have their default values. * @return * returns JAXWSResourcesService */ diff --git a/remoting/pom.xml b/remoting/pom.xml index 3bc3886e3..14556112d 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -25,9 +25,9 @@ - javax.ws.rs - javax.ws.rs-api - 2.0.1 + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 true diff --git a/sandbox/fr.opensagres.xdocreport.remoting.api/pom.xml b/sandbox/fr.opensagres.xdocreport.remoting.api/pom.xml index 7cdec7c10..df82d0ffe 100644 --- a/sandbox/fr.opensagres.xdocreport.remoting.api/pom.xml +++ b/sandbox/fr.opensagres.xdocreport.remoting.api/pom.xml @@ -11,16 +11,16 @@ - org.apache.geronimo.specs - geronimo-jaxrs_1.1_spec - 1.0 + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 provided - org.apache.geronimo.specs - geronimo-jaxb_2.1_spec - 1.0 + jakarta.xml.bind + jakarta.xml.bind-api + 3.0.1 provided diff --git a/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/DataContext.java b/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/DataContext.java index d289f338f..8a4b6fa52 100644 --- a/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/DataContext.java +++ b/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/DataContext.java @@ -24,7 +24,7 @@ */ package fr.opensagres.xdocreport.document.domain; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class DataContext diff --git a/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/ReportAndDataRepresentation.java b/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/ReportAndDataRepresentation.java index 87e95c8b7..66bbd1cfd 100644 --- a/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/ReportAndDataRepresentation.java +++ b/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/ReportAndDataRepresentation.java @@ -27,8 +27,8 @@ import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlMimeType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlMimeType; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class ReportAndDataRepresentation diff --git a/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/ReportId.java b/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/ReportId.java index 3dde45b5f..cc9cb5f34 100644 --- a/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/ReportId.java +++ b/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/ReportId.java @@ -26,8 +26,8 @@ import java.util.Date; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class ReportId diff --git a/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/ReportRepresentation.java b/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/ReportRepresentation.java index c966bd5d4..31783d3ce 100644 --- a/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/ReportRepresentation.java +++ b/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/ReportRepresentation.java @@ -28,8 +28,8 @@ import java.util.Date; import java.util.List; -import javax.xml.bind.annotation.XmlMimeType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlMimeType; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class ReportRepresentation diff --git a/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/WSOptions.java b/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/WSOptions.java index 18d1b62fd..cef224406 100644 --- a/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/WSOptions.java +++ b/sandbox/fr.opensagres.xdocreport.remoting.api/src/main/java/fr/opensagres/xdocreport/document/domain/WSOptions.java @@ -24,7 +24,7 @@ */ package fr.opensagres.xdocreport.document.domain; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class WSOptions diff --git a/sandbox/fr.opensagres.xdocreport.remoting.javaclient/pom.xml b/sandbox/fr.opensagres.xdocreport.remoting.javaclient/pom.xml index c5f620e97..2f465b7b0 100644 --- a/sandbox/fr.opensagres.xdocreport.remoting.javaclient/pom.xml +++ b/sandbox/fr.opensagres.xdocreport.remoting.javaclient/pom.xml @@ -14,8 +14,8 @@ org.apache.cxf - cxf-bundle-jaxrs - 2.5.2 + cxf-rt-rs-client + 4.0.4 xmlschema-core @@ -29,18 +29,6 @@ stax2-api org.codehaus.woodstox - - geronimo-stax-api_1.0_spec - org.apache.geronimo.specs - - - geronimo-annotation_1.0_spec - org.apache.geronimo.specs - - - geronimo-javamail_1.4_spec - org.apache.geronimo.specs - spring-web org.springframework @@ -53,14 +41,6 @@ spring-beans org.springframework - - jaxb-impl - com.sun.xml.bind - - - geronimo-activation_1.1_spec - org.apache.geronimo.specs - spring-core org.springframework @@ -109,14 +89,6 @@ jetty-security org.eclipse.jetty - - geronimo-servlet_2.5_spec - org.apache.geronimo.specs - - - jaxb-api - javax.xml.bind - slf4j-api org.slf4j @@ -124,9 +96,9 @@ - javax.xml.bind - jaxb-api - 2.2.3 + jakarta.xml.bind + jakarta.xml.bind-api + 3.0.1 @@ -137,15 +109,21 @@ true - org.apache.geronimo.specs - geronimo-annotation_1.0_spec - 1.1.1 + jakarta.annotation + jakarta.annotation-api + 2.0.0 + true + + + jakarta.activation + jakarta.activation-api + 2.0.1 true - org.apache.geronimo.specs - geronimo-activation_1.0.2_spec - 1.2 + com.sun.activation + jakarta.activation + 2.0.1 true diff --git a/sandbox/fr.opensagres.xdocreport.remoting.javaclient/src/main/java/fr/opensagres/xdocreport/remoting/javaclient/XDocReportServiceJaxRsClient.java b/sandbox/fr.opensagres.xdocreport.remoting.javaclient/src/main/java/fr/opensagres/xdocreport/remoting/javaclient/XDocReportServiceJaxRsClient.java index 53f53443d..d3c0eac22 100644 --- a/sandbox/fr.opensagres.xdocreport.remoting.javaclient/src/main/java/fr/opensagres/xdocreport/remoting/javaclient/XDocReportServiceJaxRsClient.java +++ b/sandbox/fr.opensagres.xdocreport.remoting.javaclient/src/main/java/fr/opensagres/xdocreport/remoting/javaclient/XDocReportServiceJaxRsClient.java @@ -26,7 +26,7 @@ import java.util.List; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.client.WebClient; diff --git a/sandbox/fr.opensagres.xdocreport.remoting.rest/pom.xml b/sandbox/fr.opensagres.xdocreport.remoting.rest/pom.xml index 5715772dc..df02a8f7b 100644 --- a/sandbox/fr.opensagres.xdocreport.remoting.rest/pom.xml +++ b/sandbox/fr.opensagres.xdocreport.remoting.rest/pom.xml @@ -37,42 +37,58 @@ org.apache.cxf - cxf-rt-frontend-jaxrs - 2.4.0 + cxf-rt-rs-client + 4.0.4 + test + + + org.apache.cxf + cxf-rt-rs-extension-providers + 4.0.4 + test + + + org.codehaus.jettison + jettison + 1.5.4 test - - org.apache.geronimo.specs - geronimo-jaxrs_1.1_spec - 1.0 + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 provided - org.apache.geronimo.specs - geronimo-jaxb_2.1_spec - 1.0 + jakarta.xml.bind + jakarta.xml.bind-api + 3.0.1 provided org.eclipse.jetty jetty-webapp - 9.4.34.v20201102 + 11.0.21 test - javax.annotation - javax.annotation-api - 1.3.2 + jakarta.annotation + jakarta.annotation-api + 2.0.0 - javax.activation - activation - 1.1.1 + jakarta.activation + jakarta.activation-api + 2.0.1 + + + com.sun.activation + jakarta.activation + 2.0.1 diff --git a/sandbox/fr.opensagres.xdocreport.remoting.rest/src/main/java/fr/opensagres/xdocreport/service/rest/XDocReportServiceJaxRs.java b/sandbox/fr.opensagres.xdocreport.remoting.rest/src/main/java/fr/opensagres/xdocreport/service/rest/XDocReportServiceJaxRs.java index 19c91b327..d8945d4ba 100644 --- a/sandbox/fr.opensagres.xdocreport.remoting.rest/src/main/java/fr/opensagres/xdocreport/service/rest/XDocReportServiceJaxRs.java +++ b/sandbox/fr.opensagres.xdocreport.remoting.rest/src/main/java/fr/opensagres/xdocreport/service/rest/XDocReportServiceJaxRs.java @@ -26,13 +26,13 @@ import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import fr.opensagres.xdocreport.converter.Options; import fr.opensagres.xdocreport.core.XDocReportException; diff --git a/sandbox/fr.opensagres.xdocreport.remoting.rest/src/main/java/fr/opensagres/xdocreport/service/rest/XDocreportApplication.java b/sandbox/fr.opensagres.xdocreport.remoting.rest/src/main/java/fr/opensagres/xdocreport/service/rest/XDocreportApplication.java index fd3d2fa4f..9afef89f2 100644 --- a/sandbox/fr.opensagres.xdocreport.remoting.rest/src/main/java/fr/opensagres/xdocreport/service/rest/XDocreportApplication.java +++ b/sandbox/fr.opensagres.xdocreport.remoting.rest/src/main/java/fr/opensagres/xdocreport/service/rest/XDocreportApplication.java @@ -27,7 +27,7 @@ import java.util.HashSet; import java.util.Set; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.core.Application; public class XDocreportApplication extends Application diff --git a/sandbox/fr.opensagres.xdocreport.remoting.rest/src/test/java/fr/opensagres/xdocreport/service/rest/RESTXDocReportServiceTest.java b/sandbox/fr.opensagres.xdocreport.remoting.rest/src/test/java/fr/opensagres/xdocreport/service/rest/RESTXDocReportServiceTest.java index 0e765125a..7612643da 100644 --- a/sandbox/fr.opensagres.xdocreport.remoting.rest/src/test/java/fr/opensagres/xdocreport/service/rest/RESTXDocReportServiceTest.java +++ b/sandbox/fr.opensagres.xdocreport.remoting.rest/src/test/java/fr/opensagres/xdocreport/service/rest/RESTXDocReportServiceTest.java @@ -35,9 +35,9 @@ import java.util.ArrayList; import java.util.Collection; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet; diff --git a/sandbox/fr.opensagres.xdocreport.remoting.shared/pom.xml b/sandbox/fr.opensagres.xdocreport.remoting.shared/pom.xml index 57de34301..0cb57724c 100644 --- a/sandbox/fr.opensagres.xdocreport.remoting.shared/pom.xml +++ b/sandbox/fr.opensagres.xdocreport.remoting.shared/pom.xml @@ -17,16 +17,16 @@ - org.apache.geronimo.specs - geronimo-jaxrs_1.1_spec - 1.0 + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 provided - org.apache.geronimo.specs - geronimo-jaxb_2.1_spec - 1.0 + jakarta.xml.bind + jakarta.xml.bind-api + 3.0.1 provided diff --git a/sandbox/fr.opensagres.xdocreport.remoting.ws/pom.xml b/sandbox/fr.opensagres.xdocreport.remoting.ws/pom.xml index ff3c6fe3c..9c01a3c79 100644 --- a/sandbox/fr.opensagres.xdocreport.remoting.ws/pom.xml +++ b/sandbox/fr.opensagres.xdocreport.remoting.ws/pom.xml @@ -8,15 +8,15 @@ fr.opensagres.xdocreport.remoting.ws - javax.servlet - servlet-api - 2.5 + jakarta.servlet + jakarta.servlet-api + 5.0.0 provided - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - 1.1.3 + jakarta.jws + jakarta.jws-api + 3.0.0 provided @@ -25,9 +25,9 @@ 2.0.7-SNAPSHOT - javax.xml.ws - jaxws-api - 2.0 + jakarta.xml.ws + jakarta.xml.ws-api + 3.0.1 provided diff --git a/sandbox/fr.opensagres.xdocreport.remoting.ws/src/main/java/fr/opensagres/xdocreport/service/ws/WSXDocReportService.java b/sandbox/fr.opensagres.xdocreport.remoting.ws/src/main/java/fr/opensagres/xdocreport/service/ws/WSXDocReportService.java index 51b49192b..d8c0f0359 100644 --- a/sandbox/fr.opensagres.xdocreport.remoting.ws/src/main/java/fr/opensagres/xdocreport/service/ws/WSXDocReportService.java +++ b/sandbox/fr.opensagres.xdocreport.remoting.ws/src/main/java/fr/opensagres/xdocreport/service/ws/WSXDocReportService.java @@ -24,7 +24,7 @@ */ package fr.opensagres.xdocreport.service.ws; -import javax.jws.WebService; +import jakarta.jws.WebService; import fr.opensagres.xdocreport.document.internal.XDocReportServiceImpl; diff --git a/sandbox/fr.opensagres.xdocreport.remoting.ws/src/main/java/fr/opensagres/xdocreport/service/ws/WSXDocReportServlet.java b/sandbox/fr.opensagres.xdocreport.remoting.ws/src/main/java/fr/opensagres/xdocreport/service/ws/WSXDocReportServlet.java index ba30d3840..4df1a59fe 100644 --- a/sandbox/fr.opensagres.xdocreport.remoting.ws/src/main/java/fr/opensagres/xdocreport/service/ws/WSXDocReportServlet.java +++ b/sandbox/fr.opensagres.xdocreport.remoting.ws/src/main/java/fr/opensagres/xdocreport/service/ws/WSXDocReportServlet.java @@ -24,10 +24,10 @@ */ package fr.opensagres.xdocreport.service.ws; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.xml.ws.Endpoint; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.xml.ws.Endpoint; public class WSXDocReportServlet extends HttpServlet diff --git a/template/pom.xml b/template/pom.xml index 654119723..6503cf0e9 100644 --- a/template/pom.xml +++ b/template/pom.xml @@ -17,15 +17,15 @@ - javax.xml.bind - jaxb-api - 2.2 + jakarta.xml.bind + jakarta.xml.bind-api + 3.0.1 true com.sun.xml.bind jaxb-impl - 2.2 + 3.0.2 true diff --git a/thirdparties-extension/fr.opensagres.odfdom.converter.xhtml/pom.xml b/thirdparties-extension/fr.opensagres.odfdom.converter.xhtml/pom.xml index 98f5d5d53..0705c5a4d 100644 --- a/thirdparties-extension/fr.opensagres.odfdom.converter.xhtml/pom.xml +++ b/thirdparties-extension/fr.opensagres.odfdom.converter.xhtml/pom.xml @@ -18,9 +18,14 @@ 2.0.7-SNAPSHOT - javax.activation - activation - 1.1.1 + jakarta.activation + jakarta.activation-api + 2.0.1 + + + com.sun.activation + jakarta.activation + 2.0.1 diff --git a/thirdparties-extension/fr.opensagres.odfdom.converter.xhtml/src/main/java/fr/opensagres/odfdom/converter/internal/xhtml/ElementVisitorForXHTML.java b/thirdparties-extension/fr.opensagres.odfdom.converter.xhtml/src/main/java/fr/opensagres/odfdom/converter/internal/xhtml/ElementVisitorForXHTML.java index ffd2b3b60..2c111de7b 100644 --- a/thirdparties-extension/fr.opensagres.odfdom.converter.xhtml/src/main/java/fr/opensagres/odfdom/converter/internal/xhtml/ElementVisitorForXHTML.java +++ b/thirdparties-extension/fr.opensagres.odfdom.converter.xhtml/src/main/java/fr/opensagres/odfdom/converter/internal/xhtml/ElementVisitorForXHTML.java @@ -31,7 +31,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.activation.MimetypesFileTypeMap; +import jakarta.activation.MimetypesFileTypeMap; import fr.opensagres.xdocreport.core.utils.Base64Utility; import org.odftoolkit.odfdom.doc.OdfDocument; diff --git a/thirdparties-extension/fr.opensagres.struts2.views.xdocreport/pom.xml b/thirdparties-extension/fr.opensagres.struts2.views.xdocreport/pom.xml index da32b9b0d..a68edb9f0 100644 --- a/thirdparties-extension/fr.opensagres.struts2.views.xdocreport/pom.xml +++ b/thirdparties-extension/fr.opensagres.struts2.views.xdocreport/pom.xml @@ -37,9 +37,9 @@ 2.0.7-SNAPSHOT - javax.servlet - servlet-api - 2.2 + jakarta.servlet + jakarta.servlet-api + 5.0.0 provided diff --git a/thirdparties-extension/fr.opensagres.struts2.views.xdocreport/src/main/java/fr/opensagres/struts2/views/xdocreport/AbstractXDocReportResult.java b/thirdparties-extension/fr.opensagres.struts2.views.xdocreport/src/main/java/fr/opensagres/struts2/views/xdocreport/AbstractXDocReportResult.java index e68b47851..8f657fccd 100644 --- a/thirdparties-extension/fr.opensagres.struts2.views.xdocreport/src/main/java/fr/opensagres/struts2/views/xdocreport/AbstractXDocReportResult.java +++ b/thirdparties-extension/fr.opensagres.struts2.views.xdocreport/src/main/java/fr/opensagres/struts2/views/xdocreport/AbstractXDocReportResult.java @@ -42,10 +42,10 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.result.StrutsResultSupport; diff --git a/thirdparties-extension/fr.opensagres.struts2.views.xdocreport/src/main/java/fr/opensagres/struts2/views/xdocreport/ActionInvocationUtils.java b/thirdparties-extension/fr.opensagres.struts2.views.xdocreport/src/main/java/fr/opensagres/struts2/views/xdocreport/ActionInvocationUtils.java index 944aa5dc8..d60930f94 100755 --- a/thirdparties-extension/fr.opensagres.struts2.views.xdocreport/src/main/java/fr/opensagres/struts2/views/xdocreport/ActionInvocationUtils.java +++ b/thirdparties-extension/fr.opensagres.struts2.views.xdocreport/src/main/java/fr/opensagres/struts2/views/xdocreport/ActionInvocationUtils.java @@ -24,9 +24,9 @@ */ package fr.opensagres.struts2.views.xdocreport; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.struts2.ServletActionContext; diff --git a/thirdparties-extension/fr.opensagres.web.servlet.view.xdocreport/pom.xml b/thirdparties-extension/fr.opensagres.web.servlet.view.xdocreport/pom.xml index 5e946736f..4058d4535 100644 --- a/thirdparties-extension/fr.opensagres.web.servlet.view.xdocreport/pom.xml +++ b/thirdparties-extension/fr.opensagres.web.servlet.view.xdocreport/pom.xml @@ -17,7 +17,7 @@ org.springframework spring-webmvc - 5.3.18 + 6.0.21 provided @@ -32,9 +32,9 @@ 2.0.7-SNAPSHOT - javax.servlet - servlet-api - 2.2 + jakarta.servlet + jakarta.servlet-api + 5.0.0 provided diff --git a/thirdparties-extension/fr.opensagres.web.servlet.view.xdocreport/src/main/java/fr/opensagres/web/servlet/view/xdocreport/XDocReportView.java b/thirdparties-extension/fr.opensagres.web.servlet.view.xdocreport/src/main/java/fr/opensagres/web/servlet/view/xdocreport/XDocReportView.java index df849a299..abf875857 100644 --- a/thirdparties-extension/fr.opensagres.web.servlet.view.xdocreport/src/main/java/fr/opensagres/web/servlet/view/xdocreport/XDocReportView.java +++ b/thirdparties-extension/fr.opensagres.web.servlet.view.xdocreport/src/main/java/fr/opensagres/web/servlet/view/xdocreport/XDocReportView.java @@ -28,8 +28,8 @@ import java.io.InputStream; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextException;