maven upgrades, new way of configuring properties for persistence
This commit is contained in:
@@ -134,7 +134,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -152,7 +152,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -167,7 +167,7 @@
|
|||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -256,7 +256,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -271,7 +271,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -286,7 +286,7 @@
|
|||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -95,7 +95,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -110,7 +110,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -125,7 +125,7 @@
|
|||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -131,7 +131,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -146,7 +146,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -161,7 +161,7 @@
|
|||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -108,7 +108,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -126,7 +126,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -141,7 +141,7 @@
|
|||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -90,7 +90,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -105,7 +105,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -120,7 +120,7 @@
|
|||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -193,7 +193,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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>
|
||||||
<javassist.version>3.18.1-GA</javassist.version>
|
<javassist.version>3.18.1-GA</javassist.version>
|
||||||
<jstl.version>1.2</jstl.version>
|
<jstl.version>1.2</jstl.version>
|
||||||
|
|
||||||
@@ -210,7 +210,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -221,12 +221,11 @@
|
|||||||
<httpclient.version>4.3.3</httpclient.version>
|
<httpclient.version>4.3.3</httpclient.version>
|
||||||
|
|
||||||
<rest-assured.version>2.3.0</rest-assured.version>
|
<rest-assured.version>2.3.0</rest-assured.version>
|
||||||
|
|
||||||
|
|
||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -65,14 +65,11 @@ public class PersistenceConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
final Properties hibernateProperties() {
|
final Properties hibernateProperties() {
|
||||||
return new Properties() {
|
final Properties hibernateProperties = new Properties();
|
||||||
{
|
hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
||||||
setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
||||||
setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
// hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
|
||||||
|
return hibernateProperties;
|
||||||
// setProperty("hibernate.globally_quoted_identifiers", "true");
|
|
||||||
// note: necessary in launchpad-storage, but causing problems here
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -205,7 +205,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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>
|
||||||
<javassist.version>3.18.1-GA</javassist.version>
|
<javassist.version>3.18.1-GA</javassist.version>
|
||||||
<jstl.version>1.2</jstl.version>
|
<jstl.version>1.2</jstl.version>
|
||||||
|
|
||||||
@@ -223,7 +223,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -239,7 +239,7 @@
|
|||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -66,14 +66,11 @@ public class Cause1PersistenceConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
final Properties hibernateProperties() {
|
final Properties hibernateProperties() {
|
||||||
return new Properties() {
|
final Properties hibernateProperties = new Properties();
|
||||||
{
|
hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
||||||
setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
||||||
setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
// hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
|
||||||
|
return hibernateProperties;
|
||||||
// setProperty("hibernate.globally_quoted_identifiers", "true");
|
|
||||||
// note: necessary in launchpad-storage, but causing problems here
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -68,14 +68,11 @@ public class Cause2PersistenceConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
final Properties hibernateProperties() {
|
final Properties hibernateProperties() {
|
||||||
return new Properties() {
|
final Properties hibernateProperties = new Properties();
|
||||||
{
|
hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
||||||
setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
||||||
setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
// hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
|
||||||
|
return hibernateProperties;
|
||||||
// setProperty("hibernate.globally_quoted_identifiers", "true");
|
|
||||||
// note: necessary in launchpad-storage, but causing problems here
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -69,14 +69,11 @@ public class Cause3PersistenceConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
final Properties hibernateProperties() {
|
final Properties hibernateProperties() {
|
||||||
return new Properties() {
|
final Properties hibernateProperties = new Properties();
|
||||||
{
|
hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
||||||
setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
||||||
setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
// hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
|
||||||
|
return hibernateProperties;
|
||||||
// setProperty("hibernate.globally_quoted_identifiers", "true");
|
|
||||||
// note: necessary in launchpad-storage, but causing problems here
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -66,14 +66,11 @@ public class PersistenceConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
final Properties hibernateProperties() {
|
final Properties hibernateProperties() {
|
||||||
return new Properties() {
|
final Properties hibernateProperties = new Properties();
|
||||||
{
|
hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
||||||
setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
||||||
setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
// hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
|
||||||
|
return hibernateProperties;
|
||||||
// setProperty("hibernate.globally_quoted_identifiers", "true");
|
|
||||||
// note: necessary in launchpad-storage, but causing problems here
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -175,7 +175,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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>
|
||||||
<javassist.version>3.18.1-GA</javassist.version>
|
<javassist.version>3.18.1-GA</javassist.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
@@ -192,7 +192,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -207,7 +207,7 @@
|
|||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -68,14 +68,11 @@ public class PersistenceConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
final Properties hibernateProperties() {
|
final Properties hibernateProperties() {
|
||||||
return new Properties() {
|
final Properties hibernateProperties = new Properties();
|
||||||
{
|
hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
||||||
setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
||||||
setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
// hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
|
||||||
|
return hibernateProperties;
|
||||||
// setProperty("hibernate.globally_quoted_identifiers", "true");
|
|
||||||
// note: necessary in launchpad-storage, but causing problems here
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -183,7 +183,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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>
|
||||||
<javassist.version>3.18.1-GA</javassist.version>
|
<javassist.version>3.18.1-GA</javassist.version>
|
||||||
|
|
||||||
<!-- persistence -->
|
<!-- persistence -->
|
||||||
@@ -200,7 +200,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -216,7 +216,7 @@
|
|||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -68,14 +68,11 @@ public class PersistenceConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
final Properties hibernateProperties() {
|
final Properties hibernateProperties() {
|
||||||
return new Properties() {
|
final Properties hibernateProperties = new Properties();
|
||||||
{
|
hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
||||||
setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
||||||
setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
// hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
|
||||||
|
return hibernateProperties;
|
||||||
// setProperty("hibernate.globally_quoted_identifiers", "true");
|
|
||||||
// note: necessary in launchpad-storage, but causing problems here
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -178,7 +178,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -193,7 +193,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -209,7 +209,7 @@
|
|||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -73,15 +73,11 @@ public class PersistenceJPAConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
final Properties additionalProperties() {
|
final Properties additionalProperties() {
|
||||||
return new Properties() {
|
final Properties hibernateProperties = new Properties();
|
||||||
{
|
hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
||||||
setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
||||||
setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
// hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
|
||||||
|
return hibernateProperties;
|
||||||
// setProperty("hibernate.globally_quoted_identifiers", "true");
|
|
||||||
// note: necessary in launchpad-storage, but causing problems here
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -142,7 +142,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -157,7 +157,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -172,7 +172,7 @@
|
|||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -164,7 +164,7 @@
|
|||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -160,7 +160,7 @@
|
|||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -203,7 +203,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -218,7 +218,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -237,7 +237,7 @@
|
|||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|||||||
@@ -221,7 +221,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -236,7 +236,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -251,7 +251,7 @@
|
|||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -226,7 +226,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -241,7 +241,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -256,7 +256,7 @@
|
|||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -221,7 +221,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -236,7 +236,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -251,7 +251,7 @@
|
|||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -218,7 +218,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -233,7 +233,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -248,7 +248,7 @@
|
|||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -226,7 +226,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -241,7 +241,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -256,7 +256,7 @@
|
|||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
@@ -287,7 +287,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -306,7 +306,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -318,7 +318,7 @@
|
|||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|||||||
@@ -243,7 +243,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -258,7 +258,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -273,7 +273,7 @@
|
|||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|||||||
@@ -276,7 +276,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -295,7 +295,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -307,7 +307,7 @@
|
|||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|||||||
@@ -271,7 +271,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -291,7 +291,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -306,7 +306,7 @@
|
|||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|||||||
@@ -74,15 +74,11 @@ public class PersistenceConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
final Properties additionalProperties() {
|
final Properties additionalProperties() {
|
||||||
return new Properties() {
|
final Properties hibernateProperties = new Properties();
|
||||||
{
|
hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
||||||
setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
|
hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
||||||
setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
|
// hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
|
||||||
|
return hibernateProperties;
|
||||||
// setProperty("hibernate.globally_quoted_identifiers", "true");
|
|
||||||
// note: necessary in launchpad-storage, but causing problems here
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -209,7 +209,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Spring -->
|
<!-- Spring -->
|
||||||
<org.springframework.version>4.0.2.RELEASE</org.springframework.version>
|
<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 -->
|
<!-- persistence -->
|
||||||
<hibernate.version>4.3.4.Final</hibernate.version>
|
<hibernate.version>4.3.4.Final</hibernate.version>
|
||||||
@@ -224,7 +224,7 @@
|
|||||||
|
|
||||||
<!-- util -->
|
<!-- util -->
|
||||||
<guava.version>16.0.1</guava.version>
|
<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 -->
|
<!-- testing -->
|
||||||
<org.hamcrest.version>1.3</org.hamcrest.version>
|
<org.hamcrest.version>1.3</org.hamcrest.version>
|
||||||
@@ -239,7 +239,7 @@
|
|||||||
<!-- Maven plugins -->
|
<!-- Maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
<cargo-maven2-plugin.version>1.4.7</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
</properties>
|
</properties>
|
||||||
|
|||||||
@@ -206,7 +206,7 @@
|
|||||||
<!-- maven plugins -->
|
<!-- maven plugins -->
|
||||||
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
|
||||||
<maven-war-plugin.version>2.4</maven-war-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>
|
||||||
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
|
||||||
<cargo-maven2-plugin.version>1.4.6</cargo-maven2-plugin.version>
|
<cargo-maven2-plugin.version>1.4.6</cargo-maven2-plugin.version>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user