branch develop updated (bdeb097d -> e44e9654)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git from bdeb097d [jgitflow-maven-plugin]Updating develop poms back to pre merge state new e44e9654 fixes #660: Allow configuration properties starting with 'javax.persistence' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e44e96549317189367dc2188044eb8172fc9aa87 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Apr 10 16:33:18 2018 +0200 fixes #660: Allow configuration properties starting with 'javax.persistence' Summary of changes: pom.xml | 2 +- topia-it/pom.xml | 2 +- topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 2 +- .../java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java | 2 +- topia-service-csv/pom.xml | 2 +- topia-service-flyway/pom.xml | 2 +- topia-service-liquibase/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-templates/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit e44e96549317189367dc2188044eb8172fc9aa87 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Apr 10 16:33:18 2018 +0200 fixes #660: Allow configuration properties starting with 'javax.persistence' --- pom.xml | 2 +- topia-it/pom.xml | 2 +- topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 2 +- .../java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java | 2 +- topia-service-csv/pom.xml | 2 +- topia-service-flyway/pom.xml | 2 +- topia-service-liquibase/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- topia-service-replication/pom.xml | 2 +- topia-templates/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index f1432a25..7d81d07d 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index e9123336..2a553302 100644 --- a/topia-it/pom.xml +++ b/topia-it/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index c2e3a028..46c8e4b3 100644 --- a/topia-junit/pom.xml +++ b/topia-junit/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 3509e55f..439c4852 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java index ab9cf9d3..3d62e8f7 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java @@ -109,7 +109,7 @@ public class TopiaConfigurationBuilder { } for (Map.Entry<String, String> entry : hibernateExtraConfiguration.entrySet()) { String key = entry.getKey(); - boolean entryIsOk = key.startsWith("hibernate.") + boolean entryIsOk = (key.startsWith("hibernate.") || key.startsWith("javax.persistence.")) && ! MAIN_CONFIGURATION.contains(key); if ( ! entryIsOk) { throw new TopiaMisconfigurationException("hibernate extra configuration is " + diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index 45843b50..8bd1973a 100644 --- a/topia-service-csv/pom.xml +++ b/topia-service-csv/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 12909282..13a0f4eb 100644 --- a/topia-service-flyway/pom.xml +++ b/topia-service-flyway/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 095019d4..96d7e645 100644 --- a/topia-service-liquibase/pom.xml +++ b/topia-service-liquibase/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 89db7c92..bc3aa3c1 100644 --- a/topia-service-migration/pom.xml +++ b/topia-service-migration/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index c391619c..26d55b23 100644 --- a/topia-service-replication/pom.xml +++ b/topia-service-replication/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index bb3c9f8d..5e75e6b9 100644 --- a/topia-templates/pom.xml +++ b/topia-templates/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.5-SNAPSHOT</version> + <version>3.4.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm