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

Merge branch 'develop-jersey' into stable-jersey

parents faa7f5fa 5db57ce4

pom.xml

+12 −11
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


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

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

	<version>2.0.4-jersey</version>

	<version>3.0.0-jersey</version>

	

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

	<description>An ACS Client library for building Jersey-based REST API clients</description>
@@ -39,28 +39,29 @@ 


	<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>



		<acs.platform.tag>acs7</acs.platform.tag>

		<acs.platform.tag>acs23</acs.platform.tag>



		<junit.version>5.7.2</junit.version>

		<spring.version>5.3.6</spring.version>

		<jersey.version>2.39.1</jersey.version>

		<jackson.version>2.15.1</jackson.version>

		<junit.version>5.10.0</junit.version>

		<spring.version>6.0.19</spring.version>

		<jersey.version>3.1.8</jersey.version>

		<jackson.version>2.17.2</jackson.version>

	</properties>



	<dependencies>

		<dependency>

			<groupId>com.inteligr8</groupId>

			<artifactId>common-rest-client</artifactId>

			<version>2.0.8-jersey</version>

			<version>3.0.0-jersey</version>

		</dependency>

		<dependency>

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

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

			<version>2.1-SNAPSHOT-${acs.platform.tag}</version>

			<version>3.0.0-${acs.platform.tag}</version>

			<scope>provided</scope> <!-- explicitly, bring your own version -->

		</dependency>

		<dependency>
@@ -84,7 +85,7 @@ 
		<dependency>

			<groupId>org.apache.logging.log4j</groupId>

			<artifactId>log4j-slf4j-impl</artifactId>

			<version>2.19.0</version>

			<version>2.20.0</version>

			<scope>test</scope>

		</dependency>

src/test/java/com/inteligr8/alfresco/acs/ConnectionClientIT.java

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ package com.inteligr8.alfresco.acs; 
import java.util.List;

import java.util.UUID;



import javax.ws.rs.NotFoundException;

import jakarta.ws.rs.NotFoundException;



import org.junit.jupiter.api.Assertions;

import org.junit.jupiter.api.Test;

src/test/resources/log4j2.properties

+4 −4
Original line number Diff line number Diff line 
rootLogger.level=trace

rootLogger.level=info

rootLogger.appenderRef.stdout.ref=STDOUT



logger.spring.name=org.springframework

logger.spring.level=info



logger.common-rest-api.name=com.inteligr8.rs

logger.common-rest-api.level=trace

logger.common-rest-api.level=info



logger.this.name=com.inteligr8.alfresco.acs

logger.this.level=trace

logger.this.level=info



logger.jaxrslog.name=jaxrs.request

logger.jaxrslog.level=trace

logger.jaxrslog.level=info



appender.stdout.type=Console

appender.stdout.name=STDOUT