Commit c53b2220 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop-acs23' into stable-acs23

parents 76dc4200 6a646f1a

pom.xml

+19 −11
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


	<groupId>com.inteligr8.alfresco</groupId>

	<artifactId>acs-public-rest-api</artifactId>

	<version>2.1.1-acs23</version>

	<version>3.0.0-acs23</version>



	<name>Alfresco Content Services ReST API for Java</name>

	<description>A library for building ACS JAX-RS REST API clients</description>
@@ -38,17 +38,17 @@ 


	<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.debuglevel>lines,vars,source</maven.compiler.debuglevel>



		<swagger.basePackage>com.inteligr8.alfresco.acs</swagger.basePackage>

		

		<alfresco.platform.version>23.2.0</alfresco.platform.version>



		<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>
@@ -63,9 +63,9 @@ 
			<version>2.2.11</version>

		</dependency>

		<dependency>

			<groupId>javax.validation</groupId>

			<artifactId>validation-api</artifactId>

			<version>2.0.1.Final</version>

			<groupId>jakarta.activation</groupId>

			<artifactId>jakarta.activation-api</artifactId>

			<version>2.1.3</version>

		</dependency>

		<dependency>

			<groupId>org.slf4j</groupId>
@@ -75,7 +75,12 @@ 
		<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.xml.bind</groupId>

			<artifactId>jakarta.xml.bind-api</artifactId>

			<version>4.0.1</version>

		</dependency>

		<dependency>

			<groupId>com.fasterxml.jackson.module</groupId>
@@ -131,9 +136,12 @@ 
			<plugin>

				<groupId>io.swagger.codegen.v3</groupId>

				<artifactId>swagger-codegen-maven-plugin</artifactId>

				<version>3.0.45</version>

				<version>3.0.61</version>

				<configuration>

					<language>jaxrs-cxf-client</language>

					<configOptions>

						<jakarta>true</jakarta>

					</configOptions>

					<output>${basedir}</output>

					<apiPackage>${swagger.basePackage}.api</apiPackage>

					<modelPackage>${swagger.basePackage}.model</modelPackage>

src/main/java/com/inteligr8/alfresco/acs/api/NodesCxfApi.java

+6 −6
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
 */

package com.inteligr8.alfresco.acs.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.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.core.MediaType;



import com.inteligr8.alfresco.acs.model.Error;

import com.inteligr8.alfresco.acs.model.NodeBodyCreateMultipartCxf;

src/main/java/com/inteligr8/alfresco/acs/api/NodesJerseyApi.java

+6 −6
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
 */

package com.inteligr8.alfresco.acs.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.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.core.MediaType;



import com.inteligr8.alfresco.acs.model.Error;

import com.inteligr8.alfresco.acs.model.NodeBodyCreateMultipartJersey;

src/main/java/com/inteligr8/alfresco/acs/api/V0Api.java

+5 −5
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ package com.inteligr8.alfresco.acs.api; 


import java.util.List;



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.alfresco.acs.model.v0.AssociationInfo;

import com.inteligr8.alfresco.acs.model.v0.ClassInfo;

src/main/java/com/inteligr8/alfresco/acs/model/NodeBodyCreateMultipartCxf.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import java.util.List; 
import java.util.Map;

import java.util.Map.Entry;



import javax.ws.rs.core.MediaType;

import jakarta.ws.rs.core.MediaType;



import org.apache.cxf.jaxrs.ext.multipart.Attachment;

import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition;