Merge pull request #14 from bcgov/version0.1.3

updating to 1.3.0
bcgov · Aug 17, 2020 · 7e777e4 · 7e777e4
2 parents 8daf0a4 + 16f081d
commit 7e777e4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/src/pom.xml b/src/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>ca.bc.gov.open</groupId>
     <artifactId>spring-starters</artifactId>
-    <version>0.1.3-SNAPSHOT</version>
+    <version>0.1.3</version>
     <modules>
 
     </modules>

diff --git a/src/spring-bceid-starter/pom.xml b/src/spring-bceid-starter/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ca.bc.gov.open</groupId>
     <artifactId>spring-bceid-starter</artifactId>
-    <version>0.1.3-SNAPSHOT</version>
+    <version>0.1.3</version>
 
     <properties>
         <java.version>1.8</java.version>
@@ -86,7 +86,7 @@
             <dependency>
                 <groupId>ca.bc.gov.open</groupId>
                 <artifactId>spring-starters-bom</artifactId>
-                <version>0.1.3-SNAPSHOT</version>
+                <version>0.1.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/src/spring-bceid-starter/src/main/java/ca/bc/gov/open/bceid/starter/AutoConfiguration.java b/src/spring-bceid-starter/src/main/java/ca/bc/gov/open/bceid/starter/AutoConfiguration.java
@@ -9,6 +9,7 @@
 import ca.bceid.webservices.client.v9.BCeIDServiceSoap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -48,6 +49,7 @@ public BCeIDServiceSoap bCeIDServiceSoap() {
     }
 
     @Bean
+    @ConditionalOnMissingBean(BCeIDAccountService.class)
     public BCeIDAccountService bCeIDUserService(BCeIDServiceSoap bCeIDServiceSoap, AccountDetailRequestMapper accountDetailRequestMapper, IndividualIdentityMapper individualIdentityMapper) {
         return new BCeIDAccountServiceImpl(bCeIDServiceSoap, bCeIdProperties, accountDetailRequestMapper, individualIdentityMapper);
     }

diff --git a/src/spring-sftp-starter/pom.xml b/src/spring-sftp-starter/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>ca.bc.gov.open</groupId>
     <artifactId>spring-sftp-starter</artifactId>
-    <version>0.1.3-SNAPSHOT</version>
+    <version>0.1.3</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -70,7 +70,7 @@
             <dependency>
                 <groupId>ca.bc.gov.open</groupId>
                 <artifactId>spring-starters-bom</artifactId>
-                <version>0.1.3-SNAPSHOT</version>
+                <version>0.1.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/src/spring-starters-bom/pom.xml b/src/spring-starters-bom/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>ca.bc.gov.open</groupId>
     <artifactId>spring-starters-bom</artifactId>
-    <version>0.1.3-SNAPSHOT</version>
+    <version>0.1.3</version>
 
     <properties>
         <org.apache.cxf.version>3.3.7</org.apache.cxf.version>