LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

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

Former-commit-id: beb760fc50
pull/2/head
jensp 2018-03-10 17:54:15 +00:00
parent f2d8e0e000
commit cf62b40f80
15 changed files with 55 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-archetype-module/src/main/resources/archetype-resources/pom.xml
View File

@ -150,7 +150,7 @@
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>

2
ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml
View File

@ -158,7 +158,7 @@
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>

2
ccm-cms-types-agenda/pom.xml
View File

@ -179,7 +179,7 @@
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>

2
ccm-cms-types-bookmark/pom.xml
View File

@ -178,7 +178,7 @@
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>

2
ccm-cms-types-decisiontree/pom.xml
View File

@ -179,7 +179,7 @@
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>

2
ccm-cms-types-externallink/pom.xml
View File

@ -178,7 +178,7 @@
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>

2
ccm-cms-types-faqitem/pom.xml
View File

@ -178,7 +178,7 @@
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>

2
ccm-cms-types-glossaryitem/pom.xml
View File

@ -178,7 +178,7 @@
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>

2
ccm-cms-types-minutes/pom.xml
View File

@ -179,7 +179,7 @@
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>

10
ccm-cms/pom.xml
View File

@ -235,7 +235,7 @@
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -442,7 +442,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -525,7 +525,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -608,7 +608,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -691,7 +691,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>

14
ccm-core/pom.xml
View File

@ -333,7 +333,7 @@
</plugin>--> </plugin>-->
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -702,7 +702,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -784,7 +784,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -866,7 +866,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -943,7 +943,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -1024,7 +1024,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -1101,7 +1101,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>

10
ccm-docrepo/pom.xml
View File

@ -166,7 +166,7 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -348,7 +348,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -428,7 +428,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -508,7 +508,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -588,7 +588,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>

10
ccm-shortcuts/pom.xml
View File

@ -201,7 +201,7 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -397,7 +397,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -480,7 +480,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -568,7 +568,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>
@ -651,7 +651,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<configuration> <configuration>
<dialects> <dialects>
<param>h2</param> <param>h2</param>

23
ccm-testutils/src/main/java/org/libreccm/testutils/DatasetsVerifier.java
View File

@ -46,6 +46,7 @@ import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
import org.jboss.arquillian.persistence.dbunit.dataset.yaml.YamlDataSet; import org.jboss.arquillian.persistence.dbunit.dataset.yaml.YamlDataSet;
import java.io.InputStream; import java.io.InputStream;
import java.io.StringReader;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
/** /**
@ -85,7 +86,7 @@ public class DatasetsVerifier {
* one. * one.
* *
* @return An string array contains the names of the database schemata used * @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() { public String[] getSchemas() {
return new String[]{}; return new String[]{};
@ -118,8 +119,19 @@ public class DatasetsVerifier {
// } // }
// } // }
final String connectionStr = buffer.toString(); final String connectionStr = buffer.toString();
try (final Connection connection = DriverManager.getConnection( try (final Connection connection = DriverManager
connectionStr, "sa", "")) { .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 //Create DB tables etc
for (final String ddlFile : getDdlFiles()) { for (final String ddlFile : getDdlFiles()) {
processDdlFile(connection, ddlFile); processDdlFile(connection, ddlFile);
@ -181,8 +193,9 @@ public class DatasetsVerifier {
IOException { IOException {
final Path schemaPath = Paths.get(getClass().getResource(ddlFile) final Path schemaPath = Paths.get(getClass().getResource(ddlFile)
.toURI()); .toURI());
RunScript.execute(connection, Files.newBufferedReader( RunScript.execute(connection,
schemaPath, StandardCharsets.UTF_8)); Files.newBufferedReader(schemaPath,
StandardCharsets.UTF_8));
} }
private void verifyDumping(final IDatabaseConnection connection) private void verifyDumping(final IDatabaseConnection connection)

12
pom.xml
View File

@ -260,7 +260,7 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>de.jpdigital</groupId> <groupId>de.jpdigital</groupId>
<artifactId>hibernate50-ddl-maven-plugin</artifactId> <artifactId>hibernate51-ddl-maven-plugin</artifactId>
<version>2.1.0</version> <version>2.1.0</version>
</plugin> </plugin>
<plugin> <plugin>
@ -382,7 +382,7 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId> <artifactId>hibernate-entitymanager</artifactId>
<version>5.0.10.Final</version> <version>5.1.10.Final</version>
</dependency> </dependency>
<!-- <!--
@ -392,7 +392,7 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId> <artifactId>hibernate-envers</artifactId>
<version>5.0.10.Final</version> <version>5.1.10.Final</version>
</dependency> </dependency>
<!-- <!--
@ -401,12 +401,12 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<version>5.4.1.Final</version> <version>5.4.2.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<version>5.4.1.Final</version> <version>5.4.2.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.el</groupId> <groupId>javax.el</groupId>
@ -426,7 +426,7 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-search-orm</artifactId> <artifactId>hibernate-search-orm</artifactId>
<version>5.5.4.Final</version> <version>5.5.8.Final</version>
</dependency> </dependency>
<!-- <!--