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

CCM NG: Updating dependencies 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5820 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: ea9fe8e9c8
pull/2/head
jensp 2019-02-01 16:45:33 +00:00
parent 0ab99cf162
commit 6ec43994b1
17 changed files with 104 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<artifactId>hibernate-core</artifactId>
</dependency>
<dependency>
@ -150,7 +150,7 @@
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>

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

@ -42,7 +42,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<artifactId>hibernate-core</artifactId>
</dependency>
<dependency>
@ -158,7 +158,7 @@
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>

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

@ -46,7 +46,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency>
@ -179,7 +179,7 @@
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>

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

@ -46,7 +46,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency>
@ -178,7 +178,7 @@
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>

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

@ -46,7 +46,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency>
@ -179,7 +179,7 @@
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>

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

@ -46,7 +46,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency>
@ -178,7 +178,7 @@
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>

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

@ -46,7 +46,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency>
@ -178,7 +178,7 @@
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>

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

@ -46,7 +46,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency>
@ -178,7 +178,7 @@
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>

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

@ -46,7 +46,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency>
@ -179,7 +179,7 @@
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>

12
ccm-cms/pom.xml
View File

@ -44,7 +44,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency>
@ -221,7 +221,7 @@
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -403,7 +403,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -486,7 +486,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -569,7 +569,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -652,7 +652,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>

16
ccm-core/pom.xml
View File

@ -38,7 +38,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency>
@ -325,7 +325,7 @@
</plugin>-->
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -648,7 +648,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -730,7 +730,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -812,7 +812,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -889,7 +889,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -970,7 +970,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -1047,7 +1047,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>

35
ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java
View File

@ -223,7 +223,7 @@ public class CcmIntegrator implements Integrator {
throw new IntegrationException(String.format(
"Integration failed. Database \"%s\" is not supported yet.",
connection.getMetaData().
getDatabaseProductName()));
getDatabaseProductName()));
}
}
@ -432,14 +432,16 @@ public class CcmIntegrator implements Integrator {
if (directoryProvider.isPresent()) {
LOGGER.debug("Found setting for directory provider: {}",
directoryProvider.orElse(""));
sessionFactory.getProperties().setProperty(
"hibernate.search.default.directory_provider",
directoryProvider.get());
sessionFactory
.getProperties()
.put("hibernate.search.default.directory_provider",
directoryProvider.get());
} else {
LOGGER.debug("No setting for directory provider. "
+ "Defaulting to RAM directory provider.");
sessionFactory.getProperties().setProperty(
"hibernate.search.default.directory_provider", "ram");
sessionFactory
.getProperties()
.put("hibernate.search.default.directory_provider", "ram");
}
final Optional<String> indexBase = getSetting(
@ -448,22 +450,25 @@ public class CcmIntegrator implements Integrator {
SearchConfig.INDEX_BASE);
if (indexBase.isPresent()) {
LOGGER.debug("Setting Index Base to \"{}\".", indexBase.get());
sessionFactory.getProperties().setProperty(
"hibernate.search.default.indexBase",
indexBase.get());
sessionFactory
.getProperties()
.put("hibernate.search.default.indexBase",
indexBase.get());
}
}
/**
* A helper method for getting a setting from the configuration database.
* We can't use JPA/Hibernate in this class because the JPA subsystem is
* not initialised when this class runs. Therefore we have the fallback to
* JDBC here.
* A helper method for getting a setting from the configuration database. We
* can't use JPA/Hibernate in this class because the JPA subsystem is not
* initialised when this class runs. Therefore we have the fallback to JDBC
* here.
*
* @param connection Connection to the database.
* @param connection Connection to the database.
* @param settingClass Setting class used to represent the setting.
* @param settingName The name of the setting to retrieve.
* @param settingName The name of the setting to retrieve.
*
* @return The value of the setting.
*
* @throws SQLException
*/
private Optional<String> getSetting(final Connection connection,

1
ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java
View File

@ -119,6 +119,7 @@ public class CcmObjectRepositoryTest {
.addClass(org.libreccm.modules.InstallEvent.class)
.addClass(org.libreccm.modules.UnInstallEvent.class)
.addClass(org.libreccm.modules.ShutdownEvent.class)
.addClass(org.libreccm.imexport.Exportable.class)
.addPackage(org.libreccm.security.PermissionChecker.class
.getPackage())
.addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())

17
ccm-core/src/test/resources-wildfly-remote-h2-mem/test-persistence.xml
View File

@ -26,6 +26,21 @@
<property name="hibernate.show_sql" value="true"/>
<property name="hibernate.id.new_generator_mappings" value="true"/>
<property name="hibernate.connection.autocommit" value="false" />
<property name="hibernate.dialect"
value="org.hibernate.dialect.H2Dialect" />
<property name="hibernate.jpa.compliance.transaction"
value="true" />
<property name="hibernate.jpa.compliance.query"
value="true" />
<property name="hibernate.jpa.compliance.list"
value="true" />
<property name="hibernate.jpa.compliance.closed"
value="true" />
<property name="hibernate.jpa.compliance.proxy"
value="true" />
<property name="hibernate.jpa.compliance.global_id_generators"
value="false" />
<!--
Properties for Hibernate Envers
@ -33,7 +48,7 @@
when querying data than the DefaultStrategy
-->
<!--<property name="org.hibernate.envers.audit_strategy"
value="org.hibernate.envers.strategy.ValidityAuditStrategy"/>-->
value="org.hibernate.envers.strategy.ValidityAuditStrategy"/>-->
</properties>
</persistence-unit>

12
ccm-docrepo/pom.xml
View File

@ -44,7 +44,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency>
@ -166,7 +166,7 @@
</plugin>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -342,7 +342,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -422,7 +422,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -502,7 +502,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -582,7 +582,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>

12
ccm-shortcuts/pom.xml
View File

@ -46,7 +46,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<artifactId>hibernate-core</artifactId>
<scope>provided</scope>
</dependency>
@ -201,7 +201,7 @@
</plugin>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -389,7 +389,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -472,7 +472,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -560,7 +560,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>
@ -643,7 +643,7 @@
<plugins>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<configuration>
<dialects>
<param>h2</param>

37
pom.xml
View File

@ -270,7 +270,7 @@
</plugin>
<plugin>
<groupId>de.jpdigital</groupId>
<artifactId>hibernate51-ddl-maven-plugin</artifactId>
<artifactId>hibernate52-ddl-maven-plugin</artifactId>
<version>2.2.0</version>
</plugin>
<plugin>
@ -308,7 +308,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.2</version>
<version>0.8.3</version>
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
@ -380,7 +380,7 @@
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>7.0</version>
<version>8.0.1-b5</version>
</dependency>
<!--
@ -391,8 +391,8 @@
-->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>5.1.10.Final</version>
<artifactId>hibernate-core</artifactId>
<version>5.3.7.Final</version>
</dependency>
<!--
@ -402,7 +402,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId>
<version>5.1.10.Final</version>
<version>5.3.7.Final</version>
</dependency>
<!--
@ -411,22 +411,22 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>5.4.2.Final</version>
<version>6.0.14.Final</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator-cdi</artifactId>
<version>5.4.2.Final</version>
<version>6.0.14.Final</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<version>3.0.0</version>
<version>3.0.1-b06</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<version>3.0.1-b08</version>
<version>3.0.1-b11</version>
</dependency>
<!--
@ -687,17 +687,22 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.4.0.Final</version>
<version>1.4.1.Final</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-transaction-bom</artifactId>
<version>1.0.3.Final</version>
<version>1.0.5</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-transaction-impl-base</artifactId>
<version>1.0.5</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-persistence-dbunit</artifactId>
@ -706,18 +711,18 @@
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-jacoco</artifactId>
<version>1.0.0.Alpha9</version>
<version>1.0.0.Alpha10</version>
</dependency>
<dependency>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
<version>2.0.2.Final</version>
<version>2.1.1.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-remote</artifactId>
<version>2.1.0.Final</version>
<version>2.1.1.Final</version>
<scope>test</scope>
</dependency>
@ -727,7 +732,7 @@
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.core</artifactId>
<version>0.8.2</version>
<version>0.8.3</version>
<scope>test</scope>
</dependency>