Spring/spring-data-examples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#553 - Upgrade to Spring Boot 2.3.

Browse Source
This commit is contained in:
Oliver Gierke
2018-02-21 18:36:53 +01:00
committed by Mark Paluch
parent 5065a04195
commit c88ad331c0
8 changed files with 6 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -46,6 +46,7 @@ install:
- /opt/couchbase/bin/couchbase-cli user-manage -c 127.0.0.1:8091 -u Administrator -p password --set --rbac-username=travel-sample --rbac-password=password --roles=admin --auth-domain local - /opt/couchbase/bin/couchbase-cli user-manage -c 127.0.0.1:8091 -u Administrator -p password --set --rbac-username=travel-sample --rbac-password=password --roles=admin --auth-domain local
script: script:
- cp -f settings.xml $HOME/.m2/settings.xml
- mvn -version - mvn -version
- java -version - java -version
- mvn clean dependency:list test -U -Dsort -Dmaven.test.redirectTestOutputToFile=true -B -s settings.xml - mvn clean test -U -Dsort -Dmaven.test.redirectTestOutputToFile=true -B -s settings.xml

61
jpa/deferred/src/main/java/example/Application.java
View File

@@ -15,21 +15,8 @@
*/ */
package example; package example;
import example.model.Customer;
import javax.sql.DataSource;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
import org.springframework.core.env.Environment;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.data.repository.config.BootstrapMode;
import org.springframework.orm.jpa.JpaVendorAdapter;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@SpringBootApplication @SpringBootApplication
public class Application { public class Application {
@@ -37,52 +24,4 @@ public class Application {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(Application.class); SpringApplication.run(Application.class);
} }
/**
* Configures a {@link LocalContainerEntityManagerFactoryBean} to use background initialization for the {@code lazy}
* and {@code deferred} profiles.
*
* @author Oliver Gierke
*/
@Configuration
@Profile({ "lazy", "deferred" })
static class LazyJpaConfiguration {
@Bean
public LocalContainerEntityManagerFactoryBean entityManagerFactory(JpaVendorAdapter jpaVendorAdapter,
DataSource dataSource, Environment environment) {
ThreadPoolTaskExecutor threadPoolTaskExecutor = new ThreadPoolTaskExecutor();
threadPoolTaskExecutor.setDaemon(true);
threadPoolTaskExecutor.afterPropertiesSet();
LocalContainerEntityManagerFactoryBean emf = new LocalContainerEntityManagerFactoryBean();
emf.setBootstrapExecutor(threadPoolTaskExecutor);
emf.setDataSource(dataSource);
emf.setJpaVendorAdapter(jpaVendorAdapter);
emf.setPackagesToScan(Customer.class.getPackage().getName());
return emf;
}
}
/**
* Bootstraps Spring Data JPA in lazy mode if the {@code lazy} profile is activated.
*
* @author Oliver Gierke
*/
@Profile("lazy")
@Configuration
@EnableJpaRepositories(bootstrapMode = BootstrapMode.LAZY)
static class LazyRepositoryConfiguration {}
/**
* Bootstraps Spring Data JPA in deferred mode if the {@code deferred} profile is activated.
*
* @author Oliver Gierke
*/
@Profile("deferred")
@Configuration
@EnableJpaRepositories(bootstrapMode = BootstrapMode.DEFERRED)
static class DeferredRepositoryConfiguration {}
} }

1
jpa/deferred/src/main/resources/application-deferred.properties Normal file
View File

@@ -0,0 +1 @@
spring.data.jpa.repositories.bootstrap-mode=deferred

1
jpa/deferred/src/main/resources/application-lazy.properties Normal file
View File

@@ -0,0 +1 @@
spring.data.jpa.repositories.bootstrap-mode=lazy

2
mongodb/util/pom.xml
View File

@@ -20,7 +20,7 @@
<dependency> <dependency>
<groupId>org.mongodb</groupId> <groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId> <artifactId>mongodb-driver-sync</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>

2
pom.xml
View File

@@ -13,7 +13,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.5.RELEASE</version> <version>2.3.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>

5
redis/pom.xml
View File

@@ -32,11 +32,6 @@
<artifactId>spring-boot-starter-data-redis</artifactId> <artifactId>spring-boot-starter-data-redis</artifactId>
</dependency> </dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>

5
solr/pom.xml
View File

@@ -27,11 +27,6 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-solr</artifactId> <artifactId>spring-boot-starter-data-solr</artifactId>
</dependency> </dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>