diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/InitializationListener.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/InitializationListener.java index 005f5baa..4f6f0826 100644 --- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/InitializationListener.java +++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/InitializationListener.java @@ -1,5 +1,6 @@ package hirs.attestationca; +import hirs.attestationca.configuration.PersistenceConfiguration; import hirs.attestationca.service.AppraiserServiceImpl; import hirs.attestationca.service.PolicyServiceImpl; import hirs.utils.HIRSProfiles; @@ -20,7 +21,7 @@ public class InitializationListener implements ServletContextListener { context.getEnvironment().addActiveProfile(HIRSProfiles.SERVER); // register the database configuration and refresh the context - context.register(AttestationCertificateAuthorityConfiguration.class); + context.register(PersistenceConfiguration.class); context.refresh(); // obtain reference to hibernate session factory diff --git a/HIRS_Utils/build.gradle b/HIRS_Utils/build.gradle index e4e42263..4ff5f6b3 100644 --- a/HIRS_Utils/build.gradle +++ b/HIRS_Utils/build.gradle @@ -48,8 +48,7 @@ dependencies { exclude group: 'junit' } compile 'org.jboss.logging:jboss-logging:3.2.0.Final' - compile 'org.apache.commons:commons-text:1.9' - + compile 'org.apache.commons:commons-text:1.10.0' // add spring plugin, but do not pull transitive dependencies (causes conflicts) compile(libs.spring_plugin) { exclude group: "org.springframework"