Merge branch 'dev'

hexagonframework · Nov 12, 2018 · 28ecacf · 28ecacf
2 parents 4bb6a65 + bf4d8b8
commit 28ecacf
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.github.hexagonframework.boot</groupId>
     <artifactId>spring-data-ebean-spring-boot</artifactId>
-    <version>1.4.0.RELEASE</version>
+    <version>2.0.0.RELEASE</version>
     <name>spring-data-ebean-spring-boot</name>
     <description>Spring boot support for spring data ebean</description>
     <packaging>pom</packaging>
@@ -45,8 +45,8 @@
     </modules>
 
     <properties>
-        <spring-boot.version>2.0.0.RELEASE</spring-boot.version>
-        <spring-data-ebean.version>1.4.0.RELEASE</spring-data-ebean.version>
+        <spring-boot.version>2.1.0.RELEASE</spring-boot.version>
+        <spring-data-ebean.version>2.0.0.RELEASE</spring-data-ebean.version>
     </properties>
 
     <profiles>

diff --git a/spring-boot-autoconfigure-data-ebean/pom.xml b/spring-boot-autoconfigure-data-ebean/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.hexagonframework.boot</groupId>
         <artifactId>spring-data-ebean-spring-boot</artifactId>
-        <version>1.4.0.RELEASE</version>
+        <version>2.0.0.RELEASE</version>
     </parent>
     <artifactId>spring-boot-autoconfigure-data-ebean</artifactId>
     <name>spring-boot-autoconfigure-data-ebean</name>
@@ -23,6 +23,12 @@
             <artifactId>spring-data-ebean</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>io.ebean</groupId>
+            <artifactId>ebean</artifactId>
+            <version>11.21.1</version>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/...org/springframework/boot/autoconfigure/data/ebean/EbeanRepositoriesAutoConfiguration.java b/...org/springframework/boot/autoconfigure/data/ebean/EbeanRepositoriesAutoConfiguration.java
@@ -71,7 +71,8 @@ public Object currentUser() {
 
   @SuppressWarnings("SpringJavaAutowiringInspection")
   @Bean
-  public ServerConfig defaultEbeanServerConfig(DataSource dataSource, CurrentUserProvider currentUserProvider) {
+  @ConditionalOnMissingBean
+  public ServerConfig serverConfig(DataSource dataSource, CurrentUserProvider currentUserProvider) {
     ServerConfig config = new ServerConfig();
 
     config.setDataSource(dataSource);
@@ -89,8 +90,9 @@ public ServerConfig defaultEbeanServerConfig(DataSource dataSource, CurrentUserP
   }
 
   @Bean
-  public EbeanServer defaultEbeanServer(ServerConfig defaultEbeanServerConfig) {
-    return EbeanServerFactory.create(defaultEbeanServerConfig);
+  @ConditionalOnMissingBean
+  public EbeanServer ebeanServer(ServerConfig serverConfig) {
+    return EbeanServerFactory.create(serverConfig);
   }
 
   @Bean

diff --git a/spring-boot-starter-data-ebean/pom.xml b/spring-boot-starter-data-ebean/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.hexagonframework.boot</groupId>
         <artifactId>spring-data-ebean-spring-boot</artifactId>
-        <version>1.4.0.RELEASE</version>
+        <version>2.0.0.RELEASE</version>
     </parent>
     <artifactId>spring-boot-starter-data-ebean</artifactId>
     <name>spring-boot-starter-data-ebean</name>