Compare commits

...
18 Commits
Author SHA1 Message Date
brian.long 1fd4604921 v3.0.1 pom 2026-04-22 12:33:04 -04:00
brian.long 2a31a13e7b Merge branch 'develop' into stable 2026-04-22 12:31:27 -04:00
brian.long b7279c4c2a ossrh-release to central-publish 2026-04-22 12:23:49 -04:00
brian.long 2ca3322e81 updated dependencies/plugins 2026-04-22 12:23:35 -04:00
brian.long 4c5e655290 Merge branch 'develop' into stable 2024-08-15 12:13:15 -04:00
brian.long 8b5c06b921 jdk v11 2024-08-15 12:10:36 -04:00
brian.long 5a4e9154ca v3.x; upgrade to jakarta 2024-08-15 12:06:21 -04:00
brian.long f4fce23b2c v2.0.4 pom 2023-06-29 11:42:33 -04:00
brian.long c30a2a3eee Merge branch 'develop' into stable 2023-06-29 11:42:11 -04:00
brian.long 4d34b9c94e added spring injection for timeouts 2023-06-29 11:40:42 -04:00
brian.long 10589e8b88 updated common-rest-client to latest version 2023-06-29 11:02:39 -04:00
brian.long 46145e260a v2.0.3 pom 2023-06-05 12:21:12 -04:00
brian.long 863340eaec Merge branch 'develop' into stable 2023-06-05 12:20:17 -04:00
brian.long fc0f19fc3e upgraded dep versions 2023-05-30 18:46:53 -04:00
brian.long 241451ec4d v2.0.2 pom 2023-05-28 12:38:08 -04:00
brian.long 008ded959f Merge branch 'develop' into stable 2023-05-28 12:37:49 -04:00
brian.long 18426e562d Merge branch 'develop' into stable 2022-10-03 09:23:28 -04:00
brian.long 77c101d64a v2.0.0 pom 2022-05-03 13:20:45 -04:00
4 changed files with 63 additions and 49 deletions
+34 -44
View File
@@ -6,7 +6,7 @@
<groupId>com.inteligr8.alfresco</groupId>
<artifactId>acs-public-rest-client</artifactId>
<version>2.0-SNAPSHOT</version>
<version>3.0.1</version>
<name>Alfresco Content Services ReST API Client for Java</name>
<description>An ACS Client library for building REST API clients that support either the CXF and Jersey frameworks</description>
@@ -39,32 +39,34 @@
<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>acs62</acs.platform.tag>
<acs.platform.tag>acs26</acs.platform.tag>
<junit.version>5.7.2</junit.version>
<spring.version>5.3.6</spring.version>
<!-- for testing only -->
<spring.version>6.2.18</spring.version>
</properties>
<dependencies>
<dependency>
<groupId>com.inteligr8</groupId>
<artifactId>common-rest-client</artifactId>
<version>2.0.1</version>
<version>3.0.4</version>
</dependency>
<dependency>
<groupId>com.inteligr8.alfresco</groupId>
<artifactId>acs-public-rest-api</artifactId>
<version>2.0.1-${acs.platform.tag}</version>
<version>3.0.2-${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>${junit.version}</version>
<version>5.14.3</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -82,41 +84,29 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.19.0</version>
<version>2.25.4</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.0</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.1.0</version>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
<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>
</plugins>
</pluginManagement>
</build>
<profiles>
<profile>
<id>ossrh-release</id>
<id>central-publish</id>
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
@@ -134,7 +124,6 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.2</version>
<executions>
<execution>
<id>javadoc</id>
@@ -158,19 +147,20 @@
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.10.0</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<publishingServerId>central</publishingServerId>
<autoPublish>true</autoPublish>
</configuration>
<!-- for some reason this is required... -->
<executions>
<execution>
<id>ossrh-deploy</id>
<id>deploy</id>
<phase>deploy</phase>
<goals><goal>deploy</goal></goals>
<goals><goal>publish</goal></goals>
</execution>
</executions>
</plugin>
@@ -61,6 +61,12 @@ 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;
}
@@ -148,5 +154,23 @@ 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;
}
}
@@ -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;
+4 -4
View File
@@ -1,17 +1,17 @@
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