maven upgrades, new way of configuring properties for persistence

This commit is contained in:
eugenp
2014-03-26 12:34:22 +02:00
parent a45c572d4b
commit ebb75abf66
35 changed files with 124 additions and 154 deletions

View File

@@ -271,7 +271,7 @@
<properties>
<!-- Spring -->
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
<org.springframework.security.version>3.2.2.RELEASE</org.springframework.security.version>
<org.springframework.security.version>3.2.3.RELEASE</org.springframework.security.version>
<!-- persistence -->
<hibernate.version>4.3.4.Final</hibernate.version>
@@ -291,7 +291,7 @@
<!-- util -->
<guava.version>16.0.1</guava.version>
<commons-lang3.version>3.3</commons-lang3.version>
<commons-lang3.version>3.3.1</commons-lang3.version>
<!-- testing -->
<org.hamcrest.version>1.3</org.hamcrest.version>
@@ -306,7 +306,7 @@
<!-- Maven plugins -->
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<maven-war-plugin.version>2.4</maven-war-plugin.version>
<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
</properties>

View File

@@ -74,15 +74,11 @@ public class PersistenceConfig {
}
final Properties additionalProperties() {
return new Properties() {
{
setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
// setProperty("hibernate.globally_quoted_identifiers", "true");
// note: necessary in launchpad-storage, but causing problems here
}
};
final Properties hibernateProperties = new Properties();
hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
// hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
return hibernateProperties;
}
}