Skip to content
This repository has been archived by the owner on Nov 30, 2024. It is now read-only.

Commit

Permalink
Working on setting dependency versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
jzonthemtn committed Mar 21, 2024
1 parent a77d56d commit be4544e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@

import java.util.Properties;

import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource;

import jakarta.persistence.EntityManagerFactory;
import org.aeonbits.owner.ConfigFactory;
import org.apache.commons.codec.binary.StringUtils;
import org.apache.logging.log4j.LogManager;
Expand All @@ -41,6 +39,8 @@

import ai.philterd.entitydb.configuration.EntityDbProperties;

import javax.sql.DataSource;

@Configuration
@EnableTransactionManagement
public class PersistenceJPAConfig {
Expand Down Expand Up @@ -100,7 +100,7 @@ public DataSource dataSource() {
@Bean
public PlatformTransactionManager transactionManager(EntityManagerFactory emf) {

JpaTransactionManager transactionManager = new JpaTransactionManager();
final JpaTransactionManager transactionManager = new JpaTransactionManager();
transactionManager.setEntityManagerFactory(emf);

return transactionManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

import java.util.Properties;

import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource;

import jakarta.persistence.EntityManagerFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.context.annotation.Bean;
Expand Down Expand Up @@ -78,7 +78,7 @@ public DataSource dataSource() {
@Bean
public PlatformTransactionManager transactionManager(EntityManagerFactory emf) {

JpaTransactionManager transactionManager = new JpaTransactionManager();
final JpaTransactionManager transactionManager = new JpaTransactionManager();
transactionManager.setEntityManagerFactory(emf);

return transactionManager;
Expand Down
1 change: 0 additions & 1 deletion entitydb-testing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<surefire.version>2.18</surefire.version>
<spring.boot.version>3.2.3</spring.boot.version>
<spring.core.version>6.1.5</spring.core.version>
<spring.data.jpa.version>1.11.23.RELEASE</spring.data.jpa.version>
<spring.data.jpa.version>3.2.4</spring.data.jpa.version>
<spring.security.version>4.2.20.RELEASE</spring.security.version>
<spymemcached.version>2.12.3</spymemcached.version>
<!-- Put these in profiles. -->
Expand Down

0 comments on commit be4544e

Please sign in to comment.