ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2025-04-19 08:36:21 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Trying to get 2.7.2 of spring boot to load

Browse Source
This commit is contained in:
Cyrus 2022-08-16 08:08:54 -04:00
parent ae8b1b72ac
commit 0e9fd56842
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
HIRS_AttestationCA/src/main/java/hirs/attestationca/AttestationCertificateAuthorityConfiguration.java
View File

@ -26,6 +26,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import javax.annotation.PostConstruct;
import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource;
import java.io.IOException;
import java.nio.file.Files;
@ -83,7 +84,7 @@ public class AttestationCertificateAuthorityConfiguration implements WebMvcConfi
@Bean
public JpaTransactionManager jpaTransactionManager() {
JpaTransactionManager transactionManager = new JpaTransactionManager();
transactionManager.setEntityManagerFactory(entityManagerFactoryBean().getObject());
transactionManager.setEntityManagerFactory(entityManagerFactory());
return transactionManager;
}
@ -143,7 +144,7 @@ public class AttestationCertificateAuthorityConfiguration implements WebMvcConfi
* @return Entity Manager
*/
@Bean
public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() {
public EntityManagerFactory entityManagerFactory() {
LocalContainerEntityManagerFactoryBean entityManagerFactoryBean
= new LocalContainerEntityManagerFactoryBean();
entityManagerFactoryBean.setJpaVendorAdapter(vendorAdaptor());
@ -152,7 +153,7 @@ public class AttestationCertificateAuthorityConfiguration implements WebMvcConfi
entityManagerFactoryBean.setPackagesToScan("hirs");
entityManagerFactoryBean.setJpaProperties(hibernateProperties());
return entityManagerFactoryBean;
return entityManagerFactoryBean.getObject();
}
private Map<String, String> getSettings() {

6
build.gradle
View File

@ -142,9 +142,9 @@ subprojects {
'org.springframework:spring-context:5.3.22',
'org.springframework:spring-expression:5.3.22',
'org.springframework:spring-orm:5.3.22'],
spring_boot: ['org.springframework.boot:spring-boot-starter-web:2.6.10',
'org.springframework.boot:spring-boot-starter-thymeleaf:2.6.10',
'org.springframework.boot:spring-boot-starter-data-jpa:2.6.10'],
spring_boot: ['org.springframework.boot:spring-boot-starter-web:2.7.2',
'org.springframework.boot:spring-boot-starter-thymeleaf:2.7.2',
'org.springframework.boot:spring-boot-starter-data-jpa:2.7.2'],
spring_data: ['org.springframework.data:spring-data-jpa:2.7.2'],
spring_msg: 'org.springframework:spring-messaging:5.3.19',
spring_plugin: 'org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE',