From 0393f3bc519f37bea3338501f7ebaa26548c9d56 Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 1 Feb 2019 16:45:33 +0000 Subject: [PATCH] CCM NG: Updating dependencies git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5820 8810af33-2d31-482b-a856-94f89814c4df --- .../resources/archetype-resources/pom.xml | 4 +- .../resources/archetype-resources/pom.xml | 4 +- ccm-cms-types-agenda/pom.xml | 4 +- ccm-cms-types-bookmark/pom.xml | 4 +- ccm-cms-types-decisiontree/pom.xml | 4 +- ccm-cms-types-externallink/pom.xml | 4 +- ccm-cms-types-faqitem/pom.xml | 4 +- ccm-cms-types-glossaryitem/pom.xml | 4 +- ccm-cms-types-minutes/pom.xml | 4 +- ccm-cms/pom.xml | 12 +++--- ccm-core/pom.xml | 16 ++++---- .../org/libreccm/modules/CcmIntegrator.java | 39 +++++++++++-------- .../core/CcmObjectRepositoryTest.java | 1 + .../test-persistence.xml | 17 +++++++- ccm-docrepo/pom.xml | 12 +++--- ccm-shortcuts/pom.xml | 12 +++--- pom.xml | 37 ++++++++++-------- 17 files changed, 104 insertions(+), 78 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 ac7eeaa91..bb6ada46a 100644 --- a/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml +++ b/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml @@ -34,7 +34,7 @@ org.hibernate - hibernate-entitymanager + hibernate-core @@ -150,7 +150,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-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 d0dd42102..ae3213325 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 @@ -42,7 +42,7 @@ org.hibernate - hibernate-entitymanager + hibernate-core @@ -158,7 +158,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 diff --git a/ccm-cms-types-agenda/pom.xml b/ccm-cms-types-agenda/pom.xml index 77e434bdc..0d5b312cc 100644 --- a/ccm-cms-types-agenda/pom.xml +++ b/ccm-cms-types-agenda/pom.xml @@ -46,7 +46,7 @@ org.hibernate - hibernate-entitymanager + hibernate-core provided @@ -179,7 +179,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 diff --git a/ccm-cms-types-bookmark/pom.xml b/ccm-cms-types-bookmark/pom.xml index 6f3a47c5d..662015f26 100644 --- a/ccm-cms-types-bookmark/pom.xml +++ b/ccm-cms-types-bookmark/pom.xml @@ -46,7 +46,7 @@ org.hibernate - hibernate-entitymanager + hibernate-core provided @@ -178,7 +178,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 diff --git a/ccm-cms-types-decisiontree/pom.xml b/ccm-cms-types-decisiontree/pom.xml index 2db15f93f..8c01e9832 100644 --- a/ccm-cms-types-decisiontree/pom.xml +++ b/ccm-cms-types-decisiontree/pom.xml @@ -46,7 +46,7 @@ org.hibernate - hibernate-entitymanager + hibernate-core provided @@ -179,7 +179,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 diff --git a/ccm-cms-types-externallink/pom.xml b/ccm-cms-types-externallink/pom.xml index 06e7dceba..79f45f71a 100644 --- a/ccm-cms-types-externallink/pom.xml +++ b/ccm-cms-types-externallink/pom.xml @@ -46,7 +46,7 @@ org.hibernate - hibernate-entitymanager + hibernate-core provided @@ -178,7 +178,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 diff --git a/ccm-cms-types-faqitem/pom.xml b/ccm-cms-types-faqitem/pom.xml index 32ee77bae..d794abc28 100644 --- a/ccm-cms-types-faqitem/pom.xml +++ b/ccm-cms-types-faqitem/pom.xml @@ -46,7 +46,7 @@ org.hibernate - hibernate-entitymanager + hibernate-core provided @@ -178,7 +178,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 diff --git a/ccm-cms-types-glossaryitem/pom.xml b/ccm-cms-types-glossaryitem/pom.xml index 8fa14fce9..6d9b711f6 100644 --- a/ccm-cms-types-glossaryitem/pom.xml +++ b/ccm-cms-types-glossaryitem/pom.xml @@ -46,7 +46,7 @@ org.hibernate - hibernate-entitymanager + hibernate-core provided @@ -178,7 +178,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 diff --git a/ccm-cms-types-minutes/pom.xml b/ccm-cms-types-minutes/pom.xml index 6c737cbf2..503ea1c44 100644 --- a/ccm-cms-types-minutes/pom.xml +++ b/ccm-cms-types-minutes/pom.xml @@ -46,7 +46,7 @@ org.hibernate - hibernate-entitymanager + hibernate-core provided @@ -179,7 +179,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml index 8110ed954..1fb3622e2 100644 --- a/ccm-cms/pom.xml +++ b/ccm-cms/pom.xml @@ -44,7 +44,7 @@ org.hibernate - hibernate-entitymanager + hibernate-core provided @@ -221,7 +221,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -403,7 +403,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -486,7 +486,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -569,7 +569,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -652,7 +652,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index e2470048f..449f13f69 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -38,7 +38,7 @@ org.hibernate - hibernate-entitymanager + hibernate-core provided @@ -325,7 +325,7 @@ --> de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -648,7 +648,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -730,7 +730,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -812,7 +812,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -889,7 +889,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -970,7 +970,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -1047,7 +1047,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 diff --git a/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java b/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java index ffad56378..6fc8914d1 100644 --- a/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java +++ b/ccm-core/src/main/java/org/libreccm/modules/CcmIntegrator.java @@ -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 indexBase = getSetting( @@ -448,23 +450,26 @@ 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. - * - * @param connection Connection to the database. + * 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 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 + * + * @throws SQLException */ private Optional getSetting(final Connection connection, final String settingClass, diff --git a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java index a1c7c1999..3c7cde898 100644 --- a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java @@ -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()) diff --git a/ccm-core/src/test/resources-wildfly-remote-h2-mem/test-persistence.xml b/ccm-core/src/test/resources-wildfly-remote-h2-mem/test-persistence.xml index 0cbdccb23..f5a16f758 100644 --- a/ccm-core/src/test/resources-wildfly-remote-h2-mem/test-persistence.xml +++ b/ccm-core/src/test/resources-wildfly-remote-h2-mem/test-persistence.xml @@ -26,6 +26,21 @@ + + + + + + + + + value="org.hibernate.envers.strategy.ValidityAuditStrategy"/>--> diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml index 66349eac2..94effd6ca 100644 --- a/ccm-docrepo/pom.xml +++ b/ccm-docrepo/pom.xml @@ -44,7 +44,7 @@ org.hibernate - hibernate-entitymanager + hibernate-core provided @@ -166,7 +166,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -342,7 +342,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -422,7 +422,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -502,7 +502,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -582,7 +582,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml index 61c7bd7aa..e0852969c 100644 --- a/ccm-shortcuts/pom.xml +++ b/ccm-shortcuts/pom.xml @@ -46,7 +46,7 @@ org.hibernate - hibernate-entitymanager + hibernate-core provided @@ -201,7 +201,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -389,7 +389,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -472,7 +472,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -560,7 +560,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 @@ -643,7 +643,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin h2 diff --git a/pom.xml b/pom.xml index 39e28dfde..8fa9f82eb 100644 --- a/pom.xml +++ b/pom.xml @@ -270,7 +270,7 @@ de.jpdigital - hibernate51-ddl-maven-plugin + hibernate52-ddl-maven-plugin 2.2.0 @@ -308,7 +308,7 @@ org.jacoco jacoco-maven-plugin - 0.8.2 + 0.8.3 org.wildfly.plugins @@ -380,7 +380,7 @@ javax javaee-api - 7.0 + 8.0.1-b5 org.hibernate - hibernate-entitymanager - 5.1.10.Final + hibernate-core + 5.3.7.Final