From 51e083c13bb29724d7e28113a7c96e795168c675 Mon Sep 17 00:00:00 2001 From: jensp Date: Sat, 10 Mar 2018 17:54:15 +0000 Subject: [PATCH] CCM NG: Upgraded dependency for Hibernate to version 5.1.10.Final (which is the version bundled with wildfly-12.0.0.Final) git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5346 8810af33-2d31-482b-a856-94f89814c4df --- .../resources/archetype-resources/pom.xml | 2 +- .../resources/archetype-resources/pom.xml | 2 +- ccm-cms-types-agenda/pom.xml | 2 +- ccm-cms-types-bookmark/pom.xml | 2 +- ccm-cms-types-decisiontree/pom.xml | 2 +- ccm-cms-types-externallink/pom.xml | 2 +- ccm-cms-types-faqitem/pom.xml | 2 +- ccm-cms-types-glossaryitem/pom.xml | 2 +- ccm-cms-types-minutes/pom.xml | 2 +- ccm-cms/pom.xml | 10 ++++---- ccm-core/pom.xml | 14 +++++------ ccm-docrepo/pom.xml | 10 ++++---- ccm-shortcuts/pom.xml | 10 ++++---- .../libreccm/testutils/DatasetsVerifier.java | 23 +++++++++++++++---- pom.xml | 12 +++++----- 15 files changed, 55 insertions(+), 42 deletions(-) diff --git a/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml b/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml index 4ec56d28b..3d7108962 100644 --- a/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml +++ b/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml @@ -150,7 +150,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 diff --git a/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml b/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml index 6a11a9a83..68f616fc5 100644 --- a/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml +++ b/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml @@ -158,7 +158,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 diff --git a/ccm-cms-types-agenda/pom.xml b/ccm-cms-types-agenda/pom.xml index 2911e99c7..2afb765fd 100644 --- a/ccm-cms-types-agenda/pom.xml +++ b/ccm-cms-types-agenda/pom.xml @@ -179,7 +179,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 diff --git a/ccm-cms-types-bookmark/pom.xml b/ccm-cms-types-bookmark/pom.xml index 3e53613e1..cbdfbc350 100644 --- a/ccm-cms-types-bookmark/pom.xml +++ b/ccm-cms-types-bookmark/pom.xml @@ -178,7 +178,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 diff --git a/ccm-cms-types-decisiontree/pom.xml b/ccm-cms-types-decisiontree/pom.xml index 53e0ac478..6e3d5423e 100644 --- a/ccm-cms-types-decisiontree/pom.xml +++ b/ccm-cms-types-decisiontree/pom.xml @@ -179,7 +179,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 diff --git a/ccm-cms-types-externallink/pom.xml b/ccm-cms-types-externallink/pom.xml index da824ee34..88b21e206 100644 --- a/ccm-cms-types-externallink/pom.xml +++ b/ccm-cms-types-externallink/pom.xml @@ -178,7 +178,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 diff --git a/ccm-cms-types-faqitem/pom.xml b/ccm-cms-types-faqitem/pom.xml index ba4dabed7..9b247687b 100644 --- a/ccm-cms-types-faqitem/pom.xml +++ b/ccm-cms-types-faqitem/pom.xml @@ -178,7 +178,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 diff --git a/ccm-cms-types-glossaryitem/pom.xml b/ccm-cms-types-glossaryitem/pom.xml index 435f63719..7bc8e36eb 100644 --- a/ccm-cms-types-glossaryitem/pom.xml +++ b/ccm-cms-types-glossaryitem/pom.xml @@ -178,7 +178,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 diff --git a/ccm-cms-types-minutes/pom.xml b/ccm-cms-types-minutes/pom.xml index 86bf51ce4..1c6108de2 100644 --- a/ccm-cms-types-minutes/pom.xml +++ b/ccm-cms-types-minutes/pom.xml @@ -179,7 +179,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml index c0c19a3ff..c4edae860 100644 --- a/ccm-cms/pom.xml +++ b/ccm-cms/pom.xml @@ -235,7 +235,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -442,7 +442,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -525,7 +525,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -608,7 +608,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -691,7 +691,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index 014881841..66bb5898e 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -333,7 +333,7 @@ --> de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -702,7 +702,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -784,7 +784,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -866,7 +866,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -943,7 +943,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -1024,7 +1024,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -1101,7 +1101,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml index 57aca0506..b6e28a3ef 100644 --- a/ccm-docrepo/pom.xml +++ b/ccm-docrepo/pom.xml @@ -166,7 +166,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -348,7 +348,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -428,7 +428,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -508,7 +508,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -588,7 +588,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml index f37a7d774..1ba81b4f0 100644 --- a/ccm-shortcuts/pom.xml +++ b/ccm-shortcuts/pom.xml @@ -201,7 +201,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -397,7 +397,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -480,7 +480,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -568,7 +568,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 @@ -651,7 +651,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin h2 diff --git a/ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java b/ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java index 800ed55d7..1e7ad323d 100644 --- a/ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java +++ b/ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java @@ -46,6 +46,7 @@ import org.dbunit.dataset.xml.FlatXmlDataSetBuilder; import org.jboss.arquillian.persistence.dbunit.dataset.yaml.YamlDataSet; import java.io.InputStream; +import java.io.StringReader; import java.nio.charset.StandardCharsets; /** @@ -85,7 +86,7 @@ public class DatasetsVerifier { * one. * * @return An string array contains the names of the database schemata used - * by the datasets the test. + * by the datasets the test. */ public String[] getSchemas() { return new String[]{}; @@ -118,8 +119,19 @@ public class DatasetsVerifier { // } // } final String connectionStr = buffer.toString(); - try (final Connection connection = DriverManager.getConnection( - connectionStr, "sa", "")) { + try (final Connection connection = DriverManager + .getConnection(connectionStr, "sa", "")) { + final StringBuffer schemaCreateBuffer = new StringBuffer(); + for (final String schema : getSchemas()) { + schemaCreateBuffer.append(String + .format("CREATE SCHEMA IF NOT EXISTS %s;%n", schema)); + } + + try (final StringReader schemaCreateReader = new StringReader( + schemaCreateBuffer.toString())) { + RunScript.execute(connection, schemaCreateReader); + } + //Create DB tables etc for (final String ddlFile : getDdlFiles()) { processDdlFile(connection, ddlFile); @@ -181,8 +193,9 @@ public class DatasetsVerifier { IOException { final Path schemaPath = Paths.get(getClass().getResource(ddlFile) .toURI()); - RunScript.execute(connection, Files.newBufferedReader( - schemaPath, StandardCharsets.UTF_8)); + RunScript.execute(connection, + Files.newBufferedReader(schemaPath, + StandardCharsets.UTF_8)); } private void verifyDumping(final IDatabaseConnection connection) diff --git a/pom.xml b/pom.xml index 1f2a2bbf9..4bd31d217 100644 --- a/pom.xml +++ b/pom.xml @@ -260,7 +260,7 @@ de.jpdigital - hibernate50-ddl-maven-plugin + hibernate51-ddl-maven-plugin 2.1.0 @@ -382,7 +382,7 @@ org.hibernate hibernate-entitymanager - 5.0.10.Final + 5.1.10.Final