From 0e9fd56842588ee37ec6b2bb930bceda3ae9caa3 Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Tue, 16 Aug 2022 08:08:54 -0400
Subject: [PATCH] Trying to get 2.7.2 of spring boot to load

---
 .../AttestationCertificateAuthorityConfiguration.java      | 7 ++++---
 build.gradle                                               | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/AttestationCertificateAuthorityConfiguration.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/AttestationCertificateAuthorityConfiguration.java
index ca17bec1..e2d7549d 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/AttestationCertificateAuthorityConfiguration.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/AttestationCertificateAuthorityConfiguration.java
@@ -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() {
diff --git a/build.gradle b/build.gradle
index 343aea5d..bb28b30e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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',