Commit 962ef8f9 authored by Brian Long's avatar Brian Long
Browse files

v3.x; upgrade to jakarta

parent c0916958

pom.xml

+13 −7
Original line number Diff line number Diff line
@@ -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>

src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java

+9 −9
Original line number Diff line number Diff line
@@ -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;

src/main/java/com/inteligr8/activiti/api/DeadletterJobsApi.java

+1 −1
Original line number Diff line number Diff line
@@ -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 {

src/main/java/com/inteligr8/activiti/api/ExecutionApi.java

+9 −9
Original line number Diff line number Diff line
@@ -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;

src/main/java/com/inteligr8/activiti/api/JobsApi.java

+1 −1
Original line number Diff line number Diff line
@@ -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 {