diff --git a/src/bambora-payment-starter/pom.xml b/src/bambora-payment-starter/pom.xml
index 0cd0ab0..dcef901 100644
--- a/src/bambora-payment-starter/pom.xml
+++ b/src/bambora-payment-starter/pom.xml
@@ -1,93 +1,98 @@
-
-
- 4.0.0
-
- ca.bc.gov.open
- bambora-payment-starter
- 1.0.1
-
-
- 17
- 3.1.3
- 2.17.1
-
-
-
-
- github
- GitHub Packages
- https://maven.pkg.github.com/bcgov/spring-boot-starters
-
-
-
-
-
- org.springframework.boot
- spring-boot-starter-web-services
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
-
-
-
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.junit.vintage
- junit-vintage-engine
-
-
-
-
-
- org.apache.commons
- commons-lang3
-
-
-
- commons-codec
- commons-codec
-
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-dependencies
- ${spring-boot.version}
- pom
- import
-
-
- ca.bc.gov.open
- spring-starters-bom
- 1.0.1
- pom
- import
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.5.1
-
- ${java.version}
- ${java.version}
-
-
-
-
-
-
+
+
+ 4.0.0
+
+ ca.bc.gov.open
+ bambora-payment-starter
+ 1.0.2
+
+
+ 17
+ 3.3.4
+ 2.17.1
+
+
+
+
+ github
+ GitHub Packages
+ https://maven.pkg.github.com/bcgov/spring-boot-starters
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web-services
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+
+
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+ commons-codec
+ commons-codec
+
+
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-dependencies
+ ${spring-boot.version}
+ pom
+ import
+
+
+ ca.bc.gov.open
+ spring-starters-bom
+ 1.0.2
+ pom
+ import
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.5.1
+
+ ${java.version}
+ ${java.version}
+
+
+
+
+
+
diff --git a/src/pom.xml b/src/pom.xml
index b25bb47..41ff4ff 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -1,72 +1,72 @@
-
-
- 4.0.0
-
- ca.bc.gov.open
- spring-starters
- 1.0.1
-
- spring-starters
- pom
- https://github.com/bcgov/spring-boot-starters
-
-
- 17
- 2.17.1
-
-
-
-
- github
- GitHub Packages
- https://maven.pkg.github.com/bcgov/spring-boot-starters
-
-
-
-
-
- all
-
- spring-sftp-starter
- spring-bceid-starter
- spring-starters-bom
- spring-clamav-starter
- bambora-payment-starter
-
-
-
-
- sftp
-
- spring-starters-bom
- spring-sftp-starter
-
-
-
-
- bceid
-
- spring-starters-bom
- spring-bceid-starter
-
-
-
-
- clamav
-
- spring-starters-bom
- spring-clamav-starter
-
-
-
-
- payment
-
- bambora-payment-starter
-
-
-
-
-
-
+
+
+ 4.0.0
+
+ ca.bc.gov.open
+ spring-starters
+ 1.0.2
+
+ spring-starters
+ pom
+ https://github.com/bcgov/spring-boot-starters
+
+
+ 17
+ 2.17.1
+
+
+
+
+ github
+ GitHub Packages
+ https://maven.pkg.github.com/bcgov/spring-boot-starters
+
+
+
+
+
+ all
+
+ spring-sftp-starter
+ spring-bceid-starter
+ spring-starters-bom
+ spring-clamav-starter
+ bambora-payment-starter
+
+
+
+
+ sftp
+
+ spring-starters-bom
+ spring-sftp-starter
+
+
+
+
+ bceid
+
+ spring-starters-bom
+ spring-bceid-starter
+
+
+
+
+ clamav
+
+ spring-starters-bom
+ spring-clamav-starter
+
+
+
+
+ payment
+
+ bambora-payment-starter
+
+
+
+
+
+
diff --git a/src/spring-bceid-starter/pom.xml b/src/spring-bceid-starter/pom.xml
index b2c100d..3a4aa71 100644
--- a/src/spring-bceid-starter/pom.xml
+++ b/src/spring-bceid-starter/pom.xml
@@ -1,161 +1,166 @@
-
-
- 4.0.0
-
- ca.bc.gov.open
- spring-bceid-starter
- 1.0.1
-
-
- 17
- UTF-8
- 17
- 17
- 3.1.3
- 1.3.1.Final
- 2.17.1
- 4.0.1
-
-
- jdt_apt
-
-
-
-
- github
- GitHub Packages
- https://maven.pkg.github.com/bcgov/spring-boot-starters
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-starter-web-services
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
-
-
-
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.junit.vintage
- junit-vintage-engine
-
-
-
-
-
- org.apache.cxf
- cxf-rt-frontend-jaxws
-
-
-
- org.apache.cxf
- cxf-rt-transports-http
-
-
-
- org.apache.cxf
- cxf-rt-transports-http-jetty
-
-
-
- org.apache.commons
- commons-lang3
-
-
-
- joda-time
- joda-time
-
-
-
- org.mapstruct
- mapstruct
-
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-dependencies
- ${spring-boot.version}
- pom
- import
-
-
- ca.bc.gov.open
- spring-starters-bom
- 1.0.1
- pom
- import
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.5.1
-
- ${java.version}
- ${java.version}
-
-
- org.mapstruct
- mapstruct-processor
- ${org.mapstruct.version}
-
-
-
-
-
-
-
- org.apache.cxf
- cxf-codegen-plugin
- ${org.apache.cxf.version}
-
-
- generate-sources
- generate-sources
-
- ${project.build.directory}/generated-sources/cxf
-
-
- ${project.basedir}/src/main/resources/wsdl/BCeIDService.wsdl
-
- -client
- -autoNameResolution
-
-
-
-
-
- wsdl2java
-
-
-
-
-
-
-
-
-
-
+
+
+ 4.0.0
+
+ ca.bc.gov.open
+ spring-bceid-starter
+ 1.0.2
+
+
+ 17
+ UTF-8
+ 17
+ 17
+ 3.3.4
+ 1.3.1.Final
+ 2.17.1
+ 4.0.1
+
+
+ jdt_apt
+
+
+
+
+ github
+ GitHub Packages
+ https://maven.pkg.github.com/bcgov/spring-boot-starters
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web-services
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+
+
+
+
+
+ org.apache.cxf
+ cxf-rt-frontend-jaxws
+
+
+
+ org.apache.cxf
+ cxf-rt-transports-http
+
+
+
+ org.apache.cxf
+ cxf-rt-transports-http-jetty
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+ joda-time
+ joda-time
+
+
+
+ org.mapstruct
+ mapstruct
+
+
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-dependencies
+ ${spring-boot.version}
+ pom
+ import
+
+
+ ca.bc.gov.open
+ spring-starters-bom
+ 1.0.2
+ pom
+ import
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.5.1
+
+ ${java.version}
+ ${java.version}
+
+
+ org.mapstruct
+ mapstruct-processor
+ ${org.mapstruct.version}
+
+
+
+
+
+
+
+ org.apache.cxf
+ cxf-codegen-plugin
+ ${org.apache.cxf.version}
+
+
+ generate-sources
+ generate-sources
+
+ ${project.build.directory}/generated-sources/cxf
+
+
+ ${project.basedir}/src/main/resources/wsdl/BCeIDService.wsdl
+
+ -client
+ -autoNameResolution
+
+
+
+
+
+ wsdl2java
+
+
+
+
+
+
+
+
+
+
diff --git a/src/spring-clamav-starter/pom.xml b/src/spring-clamav-starter/pom.xml
index 5ef1003..ee99acc 100644
--- a/src/spring-clamav-starter/pom.xml
+++ b/src/spring-clamav-starter/pom.xml
@@ -1,111 +1,111 @@
-
-
- 4.0.0
-
- ca.bc.gov.open
- spring-clamav-starter
- 1.0.1
-
-
- 17
- 17
- 17
- 3.1.3
- 3.1.2
- 2.17.1
-
-
-
-
- github
- GitHub Packages
- https://maven.pkg.github.com/bcgov/spring-boot-starters
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-starter
-
-
-
- fi.solita.clamav
- clamav-client
-
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.junit.vintage
- junit-vintage-engine
-
-
-
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-dependencies
- ${spring-boot.version}
- pom
- import
-
-
- ca.bc.gov.open
- spring-starters-bom
- 1.0.1
- pom
- import
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- ${org.apache.maven.plugins.version.version}
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- ${org.apache.maven.plugins.version.version}
-
-
-
- org.jacoco
- jacoco-maven-plugin
- 0.8.7
-
-
-
- prepare-agent
-
-
-
-
- report
- test
-
- report
-
-
-
-
-
-
-
-
-
+
+
+ 4.0.0
+
+ ca.bc.gov.open
+ spring-clamav-starter
+ 1.0.2
+
+
+ 17
+ 17
+ 17
+ 3.3.4
+ 3.1.2
+ 2.17.1
+
+
+
+
+ github
+ GitHub Packages
+ https://maven.pkg.github.com/bcgov/spring-boot-starters
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter
+
+
+
+ fi.solita.clamav
+ clamav-client
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+
+
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-dependencies
+ ${spring-boot.version}
+ pom
+ import
+
+
+ ca.bc.gov.open
+ spring-starters-bom
+ 1.0.2
+ pom
+ import
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ ${org.apache.maven.plugins.version.version}
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+ ${org.apache.maven.plugins.version.version}
+
+
+
+ org.jacoco
+ jacoco-maven-plugin
+ 0.8.7
+
+
+
+ prepare-agent
+
+
+
+
+ report
+ test
+
+ report
+
+
+
+
+
+
+
+
+
diff --git a/src/spring-clamav-starter/src/test/java/ca/bc/gov/open/clamav/starter/AutoConfigurationTest.java b/src/spring-clamav-starter/src/test/java/ca/bc/gov/open/clamav/starter/AutoConfigurationTest.java
index 341d5ed..f67a45a 100644
--- a/src/spring-clamav-starter/src/test/java/ca/bc/gov/open/clamav/starter/AutoConfigurationTest.java
+++ b/src/spring-clamav-starter/src/test/java/ca/bc/gov/open/clamav/starter/AutoConfigurationTest.java
@@ -1,9 +1,13 @@
package ca.bc.gov.open.clamav.starter;
import fi.solita.clamav.ClamAVClient;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import static org.assertj.core.api.Assertions.assertThat;
@@ -11,31 +15,24 @@
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class AutoConfigurationTest {
-
-
ApplicationContextRunner context;
- ClamAvProperties clamAvProperties;
-
@BeforeEach
public void setUp() {
-
- context = new ApplicationContextRunner()
- .withUserConfiguration(AutoConfiguration.class)
- .withPropertyValues("bcgov.clamav.host=testhost")
- .withPropertyValues("bcgov.clamav.port=1234")
- .withPropertyValues("bcgov.clamav.timeout=500")
- .withUserConfiguration(ClamAvProperties.class);
-
+ context = new ApplicationContextRunner();
}
@Test
void clamAVClient() {
- context.run(it -> { assertThat(it).hasSingleBean(ClamAVClient.class); });
+ context.run(it -> {
+ Assertions.assertNotNull(assertThat(it).getBean(ClamAVClient.class));
+ });
}
@Test
void clamAvService() {
- context.run(it -> { assertThat(it).hasSingleBean(ClamAvService.class); });
+ context.run(it -> {
+ Assertions.assertNotNull(assertThat(it).getBean(ClamAvService.class));
+ });
}
-}
+}
\ No newline at end of file
diff --git a/src/spring-sftp-starter/pom.xml b/src/spring-sftp-starter/pom.xml
index 8dd5325..8b394d0 100644
--- a/src/spring-sftp-starter/pom.xml
+++ b/src/spring-sftp-starter/pom.xml
@@ -1,105 +1,105 @@
-
-
-
- 4.0.0
-
- ca.bc.gov.open
- spring-sftp-starter
- 1.0.1
-
-
- UTF-8
- 17
- 17
- 3.1.3
- 2.17.1
-
-
-
-
- github
- GitHub Packages
- https://maven.pkg.github.com/bcgov/spring-boot-starters
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-starter
-
-
-
- com.github.mwiede
- jsch
- 0.2.13
-
-
-
- commons-io
- commons-io
-
-
-
- org.apache.commons
- commons-lang3
-
-
-
- org.slf4j
- slf4j-api
-
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.junit.vintage
- junit-vintage-engine
-
-
-
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-dependencies
- ${spring-boot.version}
- pom
- import
-
-
- ca.bc.gov.open
- spring-starters-bom
- 1.0.1
- pom
- import
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.22.0
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- 2.22.0
-
-
-
-
-
+
+
+
+ 4.0.0
+
+ ca.bc.gov.open
+ spring-sftp-starter
+ 1.0.2
+
+
+ UTF-8
+ 17
+ 17
+ 3.3.4
+ 2.17.1
+
+
+
+
+ github
+ GitHub Packages
+ https://maven.pkg.github.com/bcgov/spring-boot-starters
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter
+
+
+
+ com.github.mwiede
+ jsch
+ 0.2.13
+
+
+
+ commons-io
+ commons-io
+
+
+
+ org.apache.commons
+ commons-lang3
+
+
+
+ org.slf4j
+ slf4j-api
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+
+
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-dependencies
+ ${spring-boot.version}
+ pom
+ import
+
+
+ ca.bc.gov.open
+ spring-starters-bom
+ 1.0.2
+ pom
+ import
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.22.0
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+ 2.22.0
+
+
+
+
+
diff --git a/src/spring-starters-bom/pom.xml b/src/spring-starters-bom/pom.xml
index 08f7acd..b8f0cc0 100644
--- a/src/spring-starters-bom/pom.xml
+++ b/src/spring-starters-bom/pom.xml
@@ -1,84 +1,84 @@
-
-
-
- 4.0.0
-
- ca.bc.gov.open
- spring-starters-bom
- 1.0.1
-
-
- 4.0.1
- 2.11.2
- 2.3.1
- 2.13.0
- 2.10.6
- 1.3.1.Final
- 1.0.1
- 2.17.1
-
-
-
-
- github
- GitHub Packages
- https://maven.pkg.github.com/bcgov/spring-boot-starters
-
-
-
-
-
-
-
-
- org.mapstruct
- mapstruct
- ${org.mapstruct.version}
-
-
-
-
- org.apache.cxf
- cxf-rt-frontend-jaxws
- ${org.apache.cxf.version}
-
-
- org.apache.cxf
- cxf-rt-transports-http
- ${org.apache.cxf.version}
-
-
- org.apache.cxf
- cxf-rt-transports-http-jetty
- ${org.apache.cxf.version}
-
-
- javax.xml.bind
- jaxb-api
- ${javax.xml.bind.version}
-
-
-
- commons-io
- commons-io
- ${commons.io.version}
-
-
-
- joda-time
- joda-time
- ${joda-time.version}
-
-
-
- fi.solita.clamav
- clamav-client
- ${fi.solita.clamav}
-
-
-
-
-
-
+
+
+
+ 4.0.0
+
+ ca.bc.gov.open
+ spring-starters-bom
+ 1.0.2
+
+
+ 4.0.4
+ 2.11.2
+ 2.3.1
+ 2.14.0
+ 2.10.6
+ 1.3.1.Final
+ 1.0.1
+ 2.17.1
+
+
+
+
+ github
+ GitHub Packages
+ https://maven.pkg.github.com/bcgov/spring-boot-starters
+
+
+
+
+
+
+
+
+ org.mapstruct
+ mapstruct
+ ${org.mapstruct.version}
+
+
+
+
+ org.apache.cxf
+ cxf-rt-frontend-jaxws
+ ${org.apache.cxf.version}
+
+
+ org.apache.cxf
+ cxf-rt-transports-http
+ ${org.apache.cxf.version}
+
+
+ org.apache.cxf
+ cxf-rt-transports-http-jetty
+ ${org.apache.cxf.version}
+
+
+ javax.xml.bind
+ jaxb-api
+ ${javax.xml.bind.version}
+
+
+
+ commons-io
+ commons-io
+ ${commons.io.version}
+
+
+
+ joda-time
+ joda-time
+ ${joda-time.version}
+
+
+
+ fi.solita.clamav
+ clamav-client
+ ${fi.solita.clamav}
+
+
+
+
+
+