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

#514 - Switch to Spring Boot 2.2.

Browse Source 
Fixed infrastructure configuration in Eclipselink example.
This commit is contained in:
Oliver Drotbohm
2019-03-12 13:07:40 +01:00
committed by Oliver Drotbohm
parent fb8dccd9d4
commit 557851105c
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jpa/eclipselink/src/main/java/example/springdata/jpa/eclipselink/Application.java
View File

@@ -25,7 +25,6 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.orm.jpa.JpaBaseConfiguration;
import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizers;
import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter;
import org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter;
import org.springframework.transaction.jta.JtaTransactionManager;
@@ -46,9 +45,8 @@ public class Application extends JpaBaseConfiguration {
* @param jtaTransactionManagerProvider
*/
protected Application(DataSource dataSource, JpaProperties properties,
ObjectProvider<JtaTransactionManager> jtaTransactionManagerProvider,
ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers) {
super(dataSource, properties, jtaTransactionManagerProvider, transactionManagerCustomizers);
ObjectProvider<JtaTransactionManager> jtaTransactionManagerProvider) {
super(dataSource, properties, jtaTransactionManagerProvider);
}
/*

18
pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.5.RELEASE</version>
<version>2.2.0.M1</version>
</parent>
<modules>
@@ -35,32 +35,18 @@
<properties>
<apt.version>1.1.3</apt.version>
<lombok.version>1.18.4</lombok.version>
<lombok.version>1.18.6</lombok.version>
</properties>
<profiles>
<profile>
<id>spring-data-next</id>
<properties>
<spring-data-releasetrain.version>Lovelace-BUILD-SNAPSHOT</spring-data-releasetrain.version>
</properties>
</profile>
<profile>
<id>spring-data-next-releasetrain</id>
<properties>
<spring-data-releasetrain.version>Moore-BUILD-SNAPSHOT</spring-data-releasetrain.version>
<spring-hateoas.version>1.0.0.BUILD-SNAPSHOT</spring-hateoas.version>
<spring-plugin.version>2.0.0.BUILD-SNAPSHOT</spring-plugin.version>
</properties>
</profile>
<profile>
<id>spring-data-next-releasetrain-released</id>
<properties>
<spring-data-releasetrain.version>Moore-M2</spring-data-releasetrain.version>
<spring-hateoas.version>1.0.0.M1</spring-hateoas.version>
<spring-plugin.version>2.0.0.M1</spring-plugin.version>
</properties>
</profile>
<profile>
<id>java8</id>