Commit 4d85f2b4 authored by Brian Long's avatar Brian Long
Browse files

fixed testing for spring5

parent 064d85c6
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>
+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
+2 −2
Original line number Diff line number Diff line
@@ -12,14 +12,14 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
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, AcsClientJerseyImpl.class})
@SpringJUnitConfig(classes = {AcsClientConfiguration.class, AcsClient.class, AcsClientJerseyImpl.class})
public class ConnectionJerseyClientIT {
	
	@Autowired