Merge branch 'develop-jersey' into stable-jersey

pom.xml

@@ -6,8 +6,8 @@
 
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>acs-public-rest-client</artifactId>
-	<version>3.0-SNAPSHOT-jersey</version>
-
+	<version>2.0.1-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>
 	<url>https://bitbucket.org/inteligr8/acs-public-rest-client</url>
@@ -39,34 +39,33 @@
 
 	<properties>
 		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
-		<maven.compiler.release>11</maven.compiler.release>
+		<maven.compiler.source>8</maven.compiler.source>
+		<maven.compiler.target>8</maven.compiler.target>
 		<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>
 
-		<acs.platform.tag>acs26</acs.platform.tag>
+		<acs.platform.tag>acs7</acs.platform.tag>
 
-		<!-- for testing only -->
-		<spring.version>6.2.18</spring.version>
+		<junit.version>5.7.2</junit.version>
+		<spring.version>5.2.14.RELEASE</spring.version>
+		<jersey.version>2.35</jersey.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.inteligr8</groupId>
 			<artifactId>common-rest-client</artifactId>
-			<version>3.0.4-jersey</version>
+			<version>2.0.1-jersey</version>
 		</dependency>
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
 			<artifactId>acs-public-rest-api</artifactId>
-			<version>3.0.2-${acs.platform.tag}</version>
+			<version>2.0.1-${acs.platform.tag}</version>
 			<scope>provided</scope> <!-- explicitly, bring your own version -->
 		</dependency>
-
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.14.3</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -78,39 +77,37 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.5.14</version>
+			<version>4.5.9</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j-impl</artifactId>
-			<version>2.25.4</version>
+			<version>2.17.2</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<!-- Jersey libraries -->
+		<dependency>
+			<groupId>org.glassfish.jersey.inject</groupId>
+			<artifactId>jersey-hk2</artifactId>
+			<version>${jersey.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-json-jackson</artifactId>
+			<version>${jersey.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.5.5</version>
-				</plugin>
-				<plugin>
-					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>3.5.5</version>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>build-helper-maven-plugin</artifactId>
-					<version>3.6.1</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>3.2.0</version>
 				<executions>
 					<execution>
 						<id>add-jaxrs-src</id>
@@ -132,12 +129,34 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.0.0-M5</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.junit.jupiter</groupId>
+						<artifactId>junit-jupiter-engine</artifactId>
+						<version>${junit.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+			<plugin>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>3.0.0-M5</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.junit.jupiter</groupId>
+						<artifactId>junit-jupiter-engine</artifactId>
+						<version>${junit.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
 		</plugins>
 	</build>
 
 	<profiles>
 		<profile>
-			<id>central-publish</id>
+			<id>ossrh-release</id>
 			<properties>
 				<maven.deploy.skip>true</maven.deploy.skip>
 			</properties>
@@ -155,6 +174,7 @@
 					</plugin>
 					<plugin>
 						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>3.3.2</version>
 						<executions>
 							<execution>
 								<id>javadoc</id>
@@ -178,20 +198,19 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<groupId>org.sonatype.central</groupId>
-						<artifactId>central-publishing-maven-plugin</artifactId>
-						<version>0.10.0</version>
-						<extensions>true</extensions>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<version>1.6.13</version>
 						<configuration>
-							<publishingServerId>central</publishingServerId>
-							<autoPublish>true</autoPublish>
+							<serverId>ossrh</serverId>
+							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+							<autoReleaseAfterClose>true</autoReleaseAfterClose>
 						</configuration>
-						<!-- for some reason this is required... -->
 						<executions>
 							<execution>
-								<id>deploy</id>
+								<id>ossrh-deploy</id>
 								<phase>deploy</phase>
-								<goals><goal>publish</goal></goals>
+								<goals><goal>deploy</goal></goals>
 							</execution>
 						</executions>
 					</plugin>

src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java

@@ -61,12 +61,6 @@ public abstract class AcsClientConfiguration implements ClientConfiguration {
 	@Value("${content.service.security.oauth.grantPassword:#{null}}")
 	private String oAuthPassword;
 
-    @Value("${content.service.http.connectTimeout:#{null}}")
-    private Integer connectTimeoutInMillis;
-
-    @Value("${content.service.http.responseTimeout:#{null}}")
-    private Integer responseTimeoutInMillis;
-
 	public String getBaseUrl() {
 		return this.baseUrl;
 	}
@@ -154,23 +148,5 @@ public abstract class AcsClientConfiguration implements ClientConfiguration {
 	public void setOAuthPassword(String oAuthPassword) {
 		this.oAuthPassword = oAuthPassword;
 	}
-	
-	@Override
-	public Integer getConnectTimeoutInMillis() {
-	    return this.connectTimeoutInMillis;
-	}
-	
-	public void setConnectTimeoutInMillis(Integer connectTimeoutInMillis) {
-        this.connectTimeoutInMillis = connectTimeoutInMillis;
-    }
-	
-	@Override
-	public Integer getResponseTimeoutInMillis() {
-	    return this.responseTimeoutInMillis;
-	}
-	
-	public void setResponseTimeoutInMillis(Integer responseTimeoutInMillis) {
-        this.responseTimeoutInMillis = responseTimeoutInMillis;
-    }
 
 }

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

@@ -17,7 +17,7 @@ package com.inteligr8.alfresco.acs;
 import java.util.List;
 import java.util.UUID;
 
-import jakarta.ws.rs.NotFoundException;
+import javax.ws.rs.NotFoundException;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

src/test/resources/log4j2.properties

@@ -1,17 +1,17 @@
-rootLogger.level=info
+rootLogger.level=trace
 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=info
+logger.common-rest-api.level=trace
 
 logger.this.name=com.inteligr8.alfresco.acs
-logger.this.level=info
+logger.this.level=trace
 
 logger.jaxrslog.name=jaxrs.request
-logger.jaxrslog.level=info
+logger.jaxrslog.level=trace
 
 appender.stdout.type=Console
 appender.stdout.name=STDOUT