From 064d85c6fa4dac616cc6ed4de5eaed804de90e51 Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Fri, 4 Jun 2021 13:31:31 -0400
Subject: [PATCH 1/2] minor formatting

---
 src/main/java/com/inteligr8/alfresco/acs/AcsClient.java         | 2 +-
 src/main/java/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java  | 2 +-
 .../java/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsClient.java b/src/main/java/com/inteligr8/alfresco/acs/AcsClient.java
index 728911c..2810673 100644
--- a/src/main/java/com/inteligr8/alfresco/acs/AcsClient.java
+++ b/src/main/java/com/inteligr8/alfresco/acs/AcsClient.java
@@ -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 {
diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java b/src/main/java/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java
index 2dc699a..abbc0f3 100644
--- a/src/main/java/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java
+++ b/src/main/java/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java
@@ -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
diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java b/src/main/java/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java
index 7cdfcb6..995d577 100644
--- a/src/main/java/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java
+++ b/src/main/java/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java
@@ -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

From 4d85f2b455db37e2c4861f2f6895fc03fa3be45e Mon Sep 17 00:00:00 2001
From: Brian Long <brian@inteligr8.com>
Date: Fri, 4 Jun 2021 13:31:44 -0400
Subject: [PATCH 2/2] fixed testing for spring5

---
 pom.xml                                                      | 5 -----
 .../com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java    | 4 ++--
 .../com/inteligr8/alfresco/acs/ConnectionJerseyClientIT.java | 4 ++--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 935d612..6815f3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/src/test/java/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java b/src/test/java/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java
index feaae16..5e8d31f 100644
--- a/src/test/java/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java
+++ b/src/test/java/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java
@@ -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
diff --git a/src/test/java/com/inteligr8/alfresco/acs/ConnectionJerseyClientIT.java b/src/test/java/com/inteligr8/alfresco/acs/ConnectionJerseyClientIT.java
index 5c630e6..0059f4b 100644
--- a/src/test/java/com/inteligr8/alfresco/acs/ConnectionJerseyClientIT.java
+++ b/src/test/java/com/inteligr8/alfresco/acs/ConnectionJerseyClientIT.java
@@ -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