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

Merge branch 'develop' into stable

parents 5741c77a 4d85f2b4
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -40,11 +40,6 @@
				</exclusion>
			</exclusions>
		</dependency>
		<dependency>
			<groupId>javax.xml.bind</groupId>
			<artifactId>jaxb-api</artifactId>
			<version>2.3.1</version>
		</dependency>
		<dependency>
			<groupId>com.fasterxml.jackson.core</groupId>
			<artifactId>jackson-databind</artifactId>
+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import com.inteligr8.alfresco.acs.api.TypesApi;
import com.inteligr8.alfresco.acs.api.VersionsApi;

/**
 * Afresco Content Services Spring Client
 * Alfresco Content Services Spring Client
 */
@Component("acsClient")
public class AcsClient {
+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ import org.springframework.stereotype.Component;
import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;

/**
 * Afresco Content Services Spring Client for CXF
 * Alfresco Content Services Spring Client for CXF
 */
@Component("acsClient.cxf")
@Lazy
+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;

/**
 * Afresco Content Services Spring Client for Jersey
 * Alfresco Content Services Spring Client for Jersey
 */
@Component("acsClient.jersey")
@Lazy
+2 −2
Original line number Diff line number Diff line
@@ -13,14 +13,14 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;

import com.inteligr8.alfresco.acs.api.DiscoveryApi;
import com.inteligr8.alfresco.acs.model.RepositoryInfo;

@TestPropertySource(locations = {"/local.properties"})
@ContextConfiguration(classes = {AcsClientConfiguration.class, AcsClient.class, AcsClientCxfImpl.class})
@SpringJUnitConfig(classes = {AcsClientConfiguration.class, AcsClient.class, AcsClientCxfImpl.class})
public class ConnectionCxfClientIT {
	
	@Autowired
Loading