From 962ef8f98c685060fd7de15834025252ed6ca719 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" <brian@inteligr8.com> Date: Thu, 15 Aug 2024 12:25:28 -0400 Subject: [PATCH] v3.x; upgrade to jakarta --- pom.xml | 20 +++++++++++------ .../inteligr8/activiti/api/BaseJobsApi.java | 18 +++++++-------- .../activiti/api/DeadletterJobsApi.java | 2 +- .../inteligr8/activiti/api/ExecutionApi.java | 18 +++++++-------- .../com/inteligr8/activiti/api/JobsApi.java | 2 +- .../inteligr8/activiti/api/ManagementApi.java | 8 +++---- .../activiti/api/ProcessInstanceApi.java | 20 ++++++++--------- .../inteligr8/activiti/api/RuntimeApi.java | 8 +++---- .../inteligr8/activiti/api/TimerJobsApi.java | 2 +- .../alfresco/activiti/api/AdminApi.java | 18 +++++++-------- .../activiti/api/AppDefinitionsApi.java | 18 +++++++-------- .../activiti/api/AppDefinitionsCxfApi.java | 14 ++++++------ .../activiti/api/AppDefinitionsJerseyApi.java | 14 ++++++------ .../activiti/api/AppDeploymentsApi.java | 14 ++++++------ .../alfresco/activiti/api/AppVersionApi.java | 6 ++--- .../alfresco/activiti/api/GroupsApi.java | 10 ++++----- .../alfresco/activiti/api/HistoricApi.java | 8 +++---- .../alfresco/activiti/api/ModelsApi.java | 10 ++++----- .../activiti/api/ProcessDefinitionsApi.java | 8 +++---- .../activiti/api/ProcessInstancesApi.java | 16 +++++++------- .../alfresco/activiti/api/ProfileApi.java | 6 ++--- .../alfresco/activiti/api/ShareApi.java | 14 ++++++------ .../alfresco/activiti/api/TasksApi.java | 18 +++++++-------- .../alfresco/activiti/api/TemplatesApi.java | 22 +++++++++---------- .../activiti/api/TemplatesCxfApi.java | 14 ++++++------ .../activiti/api/TemplatesJerseyApi.java | 14 ++++++------ 26 files changed, 164 insertions(+), 158 deletions(-) diff --git a/pom.xml b/pom.xml index 8234d86..faa6e61 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <groupId>com.inteligr8.alfresco</groupId> <artifactId>aps-public-rest-api</artifactId> - <version>2.0-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> <name>Alfresco Process Services ReST API for Java</name> <description>An APS API library for building REST API clients that support both the CXF and Jersey frameworks</description> @@ -38,20 +38,26 @@ <properties> <project.build.sourceEncoding>utf-8</project.build.sourceEncoding> - <maven.compiler.source>8</maven.compiler.source> - <maven.compiler.target>8</maven.compiler.target> + <maven.compiler.source>11</maven.compiler.source> + <maven.compiler.target>11</maven.compiler.target> + <maven.compiler.release>11</maven.compiler.release> <maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel> - <jersey.version>2.39.1</jersey.version> - <cxf.version>3.5.6</cxf.version> - <jackson.version>2.15.1</jackson.version> + <jersey.version>3.1.8</jersey.version> + <cxf.version>4.0.2</cxf.version> + <jackson.version>2.17.2</jackson.version> </properties> <dependencies> <dependency> <groupId>jakarta.ws.rs</groupId> <artifactId>jakarta.ws.rs-api</artifactId> - <version>2.1.6</version> + <version>3.1.0</version> + </dependency> + <dependency> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + <version>2.1.3</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> diff --git a/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java b/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java index 84ddb65..518d5ef 100644 --- a/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java +++ b/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java @@ -17,15 +17,15 @@ package com.inteligr8.activiti.api; import java.io.File; import java.time.LocalDate; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -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.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +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.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.inteligr8.activiti.model.Action; import com.inteligr8.activiti.model.Action.ActionValue; diff --git a/src/main/java/com/inteligr8/activiti/api/DeadletterJobsApi.java b/src/main/java/com/inteligr8/activiti/api/DeadletterJobsApi.java index d0c849e..ee7c49e 100644 --- a/src/main/java/com/inteligr8/activiti/api/DeadletterJobsApi.java +++ b/src/main/java/com/inteligr8/activiti/api/DeadletterJobsApi.java @@ -14,7 +14,7 @@ */ package com.inteligr8.activiti.api; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/api/management/deadletter-jobs") public interface DeadletterJobsApi extends BaseJobsApi { diff --git a/src/main/java/com/inteligr8/activiti/api/ExecutionApi.java b/src/main/java/com/inteligr8/activiti/api/ExecutionApi.java index b7c27b7..aa3a49c 100644 --- a/src/main/java/com/inteligr8/activiti/api/ExecutionApi.java +++ b/src/main/java/com/inteligr8/activiti/api/ExecutionApi.java @@ -16,15 +16,15 @@ package com.inteligr8.activiti.api; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -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.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +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.core.MediaType; import com.fasterxml.jackson.annotation.JsonProperty; import com.inteligr8.activiti.model.Action; diff --git a/src/main/java/com/inteligr8/activiti/api/JobsApi.java b/src/main/java/com/inteligr8/activiti/api/JobsApi.java index 936a2d5..58c83b8 100644 --- a/src/main/java/com/inteligr8/activiti/api/JobsApi.java +++ b/src/main/java/com/inteligr8/activiti/api/JobsApi.java @@ -14,7 +14,7 @@ */ package com.inteligr8.activiti.api; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/api/management/jobs") public interface JobsApi extends BaseJobsApi { diff --git a/src/main/java/com/inteligr8/activiti/api/ManagementApi.java b/src/main/java/com/inteligr8/activiti/api/ManagementApi.java index 7052ae7..ee351bf 100644 --- a/src/main/java/com/inteligr8/activiti/api/ManagementApi.java +++ b/src/main/java/com/inteligr8/activiti/api/ManagementApi.java @@ -14,10 +14,10 @@ */ package com.inteligr8.activiti.api; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.inteligr8.activiti.model.Engine; import com.inteligr8.activiti.model.EngineProperties; diff --git a/src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java b/src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java index 14a21d3..8c91c0a 100644 --- a/src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java +++ b/src/main/java/com/inteligr8/activiti/api/ProcessInstanceApi.java @@ -17,16 +17,16 @@ package com.inteligr8.activiti.api; import java.io.File; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +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.core.MediaType; import com.fasterxml.jackson.annotation.JsonProperty; import com.inteligr8.activiti.model.Action; diff --git a/src/main/java/com/inteligr8/activiti/api/RuntimeApi.java b/src/main/java/com/inteligr8/activiti/api/RuntimeApi.java index c2a6eac..83be32a 100644 --- a/src/main/java/com/inteligr8/activiti/api/RuntimeApi.java +++ b/src/main/java/com/inteligr8/activiti/api/RuntimeApi.java @@ -16,10 +16,10 @@ package com.inteligr8.activiti.api; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; import com.inteligr8.activiti.model.Variable; diff --git a/src/main/java/com/inteligr8/activiti/api/TimerJobsApi.java b/src/main/java/com/inteligr8/activiti/api/TimerJobsApi.java index fdf6553..456b35b 100644 --- a/src/main/java/com/inteligr8/activiti/api/TimerJobsApi.java +++ b/src/main/java/com/inteligr8/activiti/api/TimerJobsApi.java @@ -14,7 +14,7 @@ */ package com.inteligr8.activiti.api; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/api/management/timer-jobs") public interface TimerJobsApi extends BaseJobsApi { diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java index 7022b18..7ca001a 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java @@ -16,15 +16,15 @@ package com.inteligr8.alfresco.activiti.api; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -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.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +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.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.inteligr8.activiti.model.ResultList; import com.inteligr8.alfresco.activiti.model.Group; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsApi.java index 7c5eceb..e2a09af 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsApi.java @@ -16,15 +16,15 @@ package com.inteligr8.alfresco.activiti.api; import java.io.File; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +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.core.MediaType; import com.inteligr8.alfresco.activiti.model.AppDefinitionPublishRepresentation; import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java index 0d20916..681ae78 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java @@ -1,13 +1,13 @@ package com.inteligr8.alfresco.activiti.api; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation; import com.inteligr8.alfresco.activiti.model.AppDefinitionUpdateResultRepresentation; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java index 866ce7d..0b402c6 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java @@ -1,13 +1,13 @@ package com.inteligr8.alfresco.activiti.api; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation; import com.inteligr8.alfresco.activiti.model.AppDefinitionUpdateResultRepresentation; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDeploymentsApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDeploymentsApi.java index 0540979..a6a1b06 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDeploymentsApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDeploymentsApi.java @@ -14,13 +14,13 @@ */ package com.inteligr8.alfresco.activiti.api; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.inteligr8.alfresco.activiti.model.AppDeployment; import com.inteligr8.alfresco.activiti.model.ResultListDataRepresentation; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/AppVersionApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/AppVersionApi.java index 89b6fec..961710b 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppVersionApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppVersionApi.java @@ -14,9 +14,9 @@ */ package com.inteligr8.alfresco.activiti.api; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import com.inteligr8.alfresco.activiti.model.AppVersion; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/GroupsApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/GroupsApi.java index 0346529..bd2950a 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/GroupsApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/GroupsApi.java @@ -14,11 +14,11 @@ */ package com.inteligr8.alfresco.activiti.api; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import com.inteligr8.activiti.model.ResultList; import com.inteligr8.alfresco.activiti.model.GroupLight; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/HistoricApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/HistoricApi.java index 5db781e..066bd4f 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/HistoricApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/HistoricApi.java @@ -14,10 +14,10 @@ */ package com.inteligr8.alfresco.activiti.api; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import com.inteligr8.alfresco.activiti.model.HistoricProcessInstanceQueryRepresentation; import com.inteligr8.alfresco.activiti.model.HistoricTaskQueryRepresentation; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java index 768a9f9..1f99447 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java @@ -14,11 +14,11 @@ */ package com.inteligr8.alfresco.activiti.api; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import com.inteligr8.activiti.model.ResultList; import com.inteligr8.alfresco.activiti.model.ModelRepresentation; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessDefinitionsApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessDefinitionsApi.java index 676280d..26da6f4 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessDefinitionsApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessDefinitionsApi.java @@ -14,10 +14,10 @@ */ package com.inteligr8.alfresco.activiti.api; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; import com.inteligr8.alfresco.activiti.model.ProcessDefinition; import com.inteligr8.alfresco.activiti.model.ResultListDataRepresentation; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessInstancesApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessInstancesApi.java index a9cfa53..bdf8434 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessInstancesApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessInstancesApi.java @@ -16,14 +16,14 @@ package com.inteligr8.alfresco.activiti.api; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +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 com.inteligr8.alfresco.activiti.model.CreateProcessInstance; import com.inteligr8.alfresco.activiti.model.ProcessInstance; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/ProfileApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/ProfileApi.java index 37da91a..a0a850b 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/ProfileApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ProfileApi.java @@ -14,9 +14,9 @@ */ package com.inteligr8.alfresco.activiti.api; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import com.inteligr8.alfresco.activiti.model.User; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/ShareApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/ShareApi.java index 9a3da50..f931164 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/ShareApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ShareApi.java @@ -14,13 +14,13 @@ */ package com.inteligr8.alfresco.activiti.api; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -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.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.inteligr8.activiti.model.ResultList; import com.inteligr8.alfresco.activiti.model.ShareInfoRequest; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/TasksApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/TasksApi.java index 8c12994..0a1ff49 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/TasksApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/TasksApi.java @@ -16,15 +16,15 @@ package com.inteligr8.alfresco.activiti.api; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +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 com.inteligr8.alfresco.activiti.model.AssigneeIdentifier; import com.inteligr8.alfresco.activiti.model.CompleteForm; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesApi.java index abe3fab..3ab9932 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesApi.java @@ -14,17 +14,17 @@ */ package com.inteligr8.alfresco.activiti.api; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -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.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +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.core.MediaType; +import jakarta.ws.rs.core.Response; import com.fasterxml.jackson.annotation.JsonProperty; import com.inteligr8.activiti.model.ResultList; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesCxfApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesCxfApi.java index 1072fe3..3d6200c 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesCxfApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesCxfApi.java @@ -14,13 +14,13 @@ */ package com.inteligr8.alfresco.activiti.api; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.inteligr8.alfresco.activiti.model.DocumentTemplateLight; import com.inteligr8.alfresco.activiti.model.FileMultipartCxf; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesJerseyApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesJerseyApi.java index a7fd39b..98d9043 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesJerseyApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/api/TemplatesJerseyApi.java @@ -14,13 +14,13 @@ */ package com.inteligr8.alfresco.activiti.api; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -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.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import com.inteligr8.alfresco.activiti.model.DocumentTemplateLight; import com.inteligr8.alfresco.activiti.model.FileMultipartJersey;