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

Merge pull request 'dependencies-update-2020-06' (#3) from dependencies-update-2020-06 into master

jensp 2020-06-25 16:47:32 +02:00
parent 65bf4fbd96 2734276f45
commit d6c80fec9d
72 changed files with 352 additions and 392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-archetype-module/pom.xml
View File

@ -12,7 +12,7 @@
<artifactId>ccm-archetype-module</artifactId> <artifactId>ccm-archetype-module</artifactId>
<version>7.0.0-SNAPSHOT</version> <version>7.0.0-SNAPSHOT</version>
<name>LibreCCM Module archetype</name> <name>LibreCCM Module Archetype</name>
<url>http://www.libreccm.org/devel/modules</url> <url>http://www.libreccm.org/devel/modules</url>
</project> </project>

9
ccm-bundle-devel-thorntail/pom.xml
View File

@ -3,12 +3,6 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<!--<parent>
<groupId>org.libreccm</groupId>
<artifactId>libreccm-parent</artifactId>
<version>7.0.0-SNAPSHOT</version>
</parent>-->
<parent> <parent>
<groupId>org.libreccm</groupId> <groupId>org.libreccm</groupId>
<artifactId>ccm-bundle-devel</artifactId> <artifactId>ccm-bundle-devel</artifactId>
@ -142,17 +136,14 @@
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId> <artifactId>font-awesome</artifactId>
<version>4.7.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>requirejs</artifactId> <artifactId>requirejs</artifactId>
<version>2.3.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>requirejs-domready</artifactId> <artifactId>requirejs-domready</artifactId>
<version>2.0.1-2</version>
</dependency> </dependency>
</dependencies> </dependencies>

18
ccm-bundle-devel-wildfly-web/pom.xml
View File

@ -26,28 +26,19 @@
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>font-awesome</artifactId> <artifactId>font-awesome</artifactId>
<!--<version>4.7.0</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>requirejs</artifactId> <artifactId>requirejs</artifactId>
<!--<version>2.3.5</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars</groupId> <groupId>org.webjars</groupId>
<artifactId>requirejs-domready</artifactId> <artifactId>requirejs-domready</artifactId>
<!--<version>2.0.1-2</version>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.webjars.npm</groupId> <groupId>org.webjars.npm</groupId>
<artifactId>tinymce</artifactId> <artifactId>tinymce</artifactId>
<!--<version>4.8.2</version>-->
</dependency> </dependency>
<!-- <dependency>
<groupId>org.librecms</groupId>
<artifactId>ccm-cms-js</artifactId>
<version>7.0.0-SNAPSHOT</version>
</dependency> -->
<dependency> <dependency>
<groupId>org.librecms</groupId> <groupId>org.librecms</groupId>
<artifactId>ccm-cms-pagemodelseditor</artifactId> <artifactId>ccm-cms-pagemodelseditor</artifactId>
@ -103,15 +94,6 @@
<nodeVersion>v8.11.4</nodeVersion> <nodeVersion>v8.11.4</nodeVersion>
</configuration> </configuration>
</execution> </execution>
<!-- <execution>
<id>npm link @libreccm/ccm-pagemodelseditor</id>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>link @libreccm/ccm-pagemodelseditor</arguments>
</configuration>
</execution> -->
<execution> <execution>
<id>npm link @librecms/ccm-cms-pagemodelseditor</id> <id>npm link @librecms/ccm-cms-pagemodelseditor</id>
<goals> <goals>

1
ccm-bundle-devel-wildfly/pom.xml
View File

@ -121,7 +121,6 @@
<dependency> <dependency>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>
<version>9.4.1208</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
ccm-cms-profile/pom.xml
View File

@ -64,12 +64,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

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

@ -64,12 +64,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

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

@ -64,12 +64,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

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

@ -64,12 +64,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

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

@ -64,12 +64,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

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

@ -64,12 +64,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

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

@ -64,12 +64,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

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

@ -64,12 +64,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

4
ccm-cms/pom.xml
View File

@ -55,12 +55,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

3
ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeAdminPaneController.java
View File

@ -18,7 +18,6 @@
*/ */
package com.arsdigita.cms.ui.type; package com.arsdigita.cms.ui.type;
import com.ibm.icu.impl.IllegalIcuArgumentException;
import org.libreccm.workflow.Workflow; import org.libreccm.workflow.Workflow;
import org.librecms.contentsection.ContentSection; import org.librecms.contentsection.ContentSection;
import org.librecms.contentsection.ContentSectionManager; import org.librecms.contentsection.ContentSectionManager;
@ -90,7 +89,7 @@ class ContentTypeAdminPaneController {
ofSection.getObjectId() ofSection.getObjectId()
) )
.orElseThrow( .orElseThrow(
() -> new IllegalIcuArgumentException( () -> new IllegalArgumentException(
String.format( String.format(
"No ContentSection with ID %d found.", "No ContentSection with ID %d found.",
ofSection.getObjectId() ofSection.getObjectId()

4
ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.librecms.contentsection; package org.librecms.contentsection;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category; import org.libreccm.categorization.Category;
@ -55,7 +55,7 @@ public class AssetEqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final CcmObject object1 = new CcmObject(); final CcmObject object1 = new CcmObject();
object1.setDisplayName("Object 1"); object1.setDisplayName("Object 1");

4
ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.librecms.contentsection; package org.librecms.contentsection;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObject;
@ -55,7 +55,7 @@ public class AttachmentsEqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final ContentSection section1 = new ContentSection(); final ContentSection section1 = new ContentSection();
section1.setDisplayName("section1"); section1.setDisplayName("section1");

4
ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.librecms.contentsection; package org.librecms.contentsection;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category; import org.libreccm.categorization.Category;
@ -59,7 +59,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final ContentItem item1 = new ContentItem(); final ContentItem item1 = new ContentItem();
item1.setObjectId(-1100); item1.setObjectId(-1100);

4
ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.librecms.contenttypes; package org.librecms.contenttypes;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -50,7 +50,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
} }
} }

16
ccm-core/pom.xml
View File

@ -49,12 +49,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -215,7 +215,6 @@
<dependency> <dependency>
<groupId>org.reflections</groupId> <groupId>org.reflections</groupId>
<artifactId>reflections</artifactId> <artifactId>reflections</artifactId>
<!--<version>0.9.11</version>-->
</dependency> </dependency>
<!--<dependency> <!--<dependency>
@ -255,10 +254,6 @@
<groupId>com.fasterxml.jackson.dataformat</groupId> <groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId> <artifactId>jackson-dataformat-xml</artifactId>
</dependency> </dependency>
<dependency> <!-- better xml library -->
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
</dependency>
<dependency> <!-- for csv ex-/import --> <dependency> <!-- for csv ex-/import -->
<groupId>com.fasterxml.jackson.dataformat</groupId> <groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-csv</artifactId> <artifactId>jackson-dataformat-csv</artifactId>
@ -572,13 +567,11 @@
<dependency> <dependency>
<groupId>org.apache.openejb</groupId> <groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-embedded</artifactId> <artifactId>arquillian-tomee-embedded</artifactId>
<version>1.7.3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.openejb</groupId> <groupId>org.apache.openejb</groupId>
<artifactId>tomee-embedded</artifactId> <artifactId>tomee-embedded</artifactId>
<version>1.7.3</version>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@ -610,19 +603,16 @@
<dependency> <dependency>
<groupId>org.jboss.logmanager</groupId> <groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId> <artifactId>jboss-logmanager</artifactId>
<version>2.0.3.Final</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!--Required for WebServices and RESTful WebServices--> <!--Required for WebServices and RESTful WebServices-->
<dependency> <dependency>
<groupId>org.apache.openejb</groupId> <groupId>org.apache.openejb</groupId>
<artifactId>tomee-webservices</artifactId> <artifactId>tomee-webservices</artifactId>
<version>4.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.openejb</groupId> <groupId>org.apache.openejb</groupId>
<artifactId>tomee-jaxrs</artifactId> <artifactId>tomee-jaxrs</artifactId>
<version>1.7.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
@ -702,12 +692,10 @@
<dependency> <dependency>
<groupId>org.apache.openejb</groupId> <groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-remote</artifactId> <artifactId>arquillian-tomee-remote</artifactId>
<version>1.7.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.openejb</groupId> <groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId> <artifactId>apache-tomee</artifactId>
<version>1.7.3</version>
<classifier>plus</classifier> <classifier>plus</classifier>
<type>zip</type> <type>zip</type>
</dependency> </dependency>

21
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_23__move_components_to_container.java
View File

@ -18,7 +18,8 @@
*/ */
package db.migrations.org.libreccm.ccm_core; package db.migrations.org.libreccm.ccm_core;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.BaseJavaMigration;
import org.flywaydb.core.api.migration.Context;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -29,10 +30,12 @@ import java.util.UUID;
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_23__move_components_to_container implements JdbcMigration { public class V7_0_0_23__move_components_to_container extends BaseJavaMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
final Connection connection = context.getConnection();
// Get all draft PageModels from ccm_core.page_models // Get all draft PageModels from ccm_core.page_models
final PreparedStatement retrievePageModels = connection final PreparedStatement retrievePageModels = connection
@ -42,13 +45,11 @@ public class V7_0_0_23__move_components_to_container implements JdbcMigration {
/* /*
For each PageModel: * For each PageModel: Create a single container (by inserting the data
* Create a single container (by inserting the data into * into ccm_core.page_model_container_models) set container_id of each
ccm_core.page_model_container_models) * component_model of the page_model to the ID of the new container if
* set container_id of each component_model of the page_model * the PageModel has a public version do the same but reuse the
to the ID of the new container * containerUuid
* if the PageModel has a public version do the same but reuse the
containerUuid
*/ */
final PreparedStatement createContainerId = connection final PreparedStatement createContainerId = connection
.prepareStatement("select nextval('hibernate_sequence')"); .prepareStatement("select nextval('hibernate_sequence')");

32
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_27__add_party_uuid.java
View File

@ -1,6 +1,7 @@
package db.migrations.org.libreccm.ccm_core; package db.migrations.org.libreccm.ccm_core;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.BaseJavaMigration;
import org.flywaydb.core.api.migration.Context;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -10,29 +11,30 @@ import java.util.UUID;
/* /*
* Copyright (C) 2018 LibreCCM Foundation. * Copyright (C) 2018 LibreCCM Foundation.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or modify it under
* modify it under the terms of the GNU Lesser General Public * the terms of the GNU Lesser General Public License as published by the Free
* License as published by the Free Software Foundation; either * Software Foundation; either version 2.1 of the License, or (at your option)
* version 2.1 of the License, or (at your option) any later version. * any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful, but WITHOUT
* but WITHOUT ANY WARRANTY; without even the implied warranty of * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* Lesser General Public License for more details. * details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public License
* License along with this library; if not, write to the Free Software * along with this library; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* MA 02110-1301 USA
*/ */
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_27__add_party_uuid implements JdbcMigration { public class V7_0_0_27__add_party_uuid extends BaseJavaMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
final Connection connection = context.getConnection();
final PreparedStatement retrieveParties = connection final PreparedStatement retrieveParties = connection
.prepareStatement("select PARTY_ID from CCM_CORE.PARTIES"); .prepareStatement("select PARTY_ID from CCM_CORE.PARTIES");

10
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_28__add_role_uuid.java
View File

@ -18,7 +18,9 @@
*/ */
package db.migrations.org.libreccm.ccm_core; package db.migrations.org.libreccm.ccm_core;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
import org.flywaydb.core.api.migration.BaseJavaMigration;
import org.flywaydb.core.api.migration.Context;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -29,10 +31,12 @@ import java.util.UUID;
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_28__add_role_uuid implements JdbcMigration { public class V7_0_0_28__add_role_uuid extends BaseJavaMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
final Connection connection = context.getConnection();
final PreparedStatement retrieveRoles = connection final PreparedStatement retrieveRoles = connection
.prepareStatement("select ROLE_ID from CCM_CORE.CCM_ROLES"); .prepareStatement("select ROLE_ID from CCM_CORE.CCM_ROLES");

9
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_29__add_permission_uuid.java
View File

@ -18,7 +18,8 @@
*/ */
package db.migrations.org.libreccm.ccm_core; package db.migrations.org.libreccm.ccm_core;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.BaseJavaMigration;
import org.flywaydb.core.api.migration.Context;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -29,10 +30,12 @@ import java.util.UUID;
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_29__add_permission_uuid implements JdbcMigration { public class V7_0_0_29__add_permission_uuid extends BaseJavaMigration {
@Override @Override
public void migrate(Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
final Connection connection = context.getConnection();
final PreparedStatement retrievePermissions = connection final PreparedStatement retrievePermissions = connection
.prepareStatement("select PERMISSION_ID from CCM_CORE.PERMISSIONS"); .prepareStatement("select PERMISSION_ID from CCM_CORE.PERMISSIONS");

9
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_30__add_groupmembership_uuid.java
View File

@ -18,7 +18,8 @@
*/ */
package db.migrations.org.libreccm.ccm_core; package db.migrations.org.libreccm.ccm_core;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.BaseJavaMigration;
import org.flywaydb.core.api.migration.Context;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -29,10 +30,12 @@ import java.util.UUID;
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_30__add_groupmembership_uuid implements JdbcMigration { public class V7_0_0_30__add_groupmembership_uuid extends BaseJavaMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
final Connection connection = context.getConnection();
final PreparedStatement retrieveMemberships = connection final PreparedStatement retrieveMemberships = connection
.prepareStatement("select MEMBERSHIP_ID " .prepareStatement("select MEMBERSHIP_ID "

9
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_31__add_rolemembership_uuid.java
View File

@ -18,7 +18,8 @@
*/ */
package db.migrations.org.libreccm.ccm_core; package db.migrations.org.libreccm.ccm_core;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.BaseJavaMigration;
import org.flywaydb.core.api.migration.Context;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -29,10 +30,12 @@ import java.util.UUID;
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_31__add_rolemembership_uuid implements JdbcMigration { public class V7_0_0_31__add_rolemembership_uuid extends BaseJavaMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
final Connection connection = context.getConnection();
final PreparedStatement retrieveMemberships = connection final PreparedStatement retrieveMemberships = connection
.prepareStatement("select MEMBERSHIP_ID from CCM_CORE.ROLE_MEMBERSHIPS"); .prepareStatement("select MEMBERSHIP_ID from CCM_CORE.ROLE_MEMBERSHIPS");

9
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_32__add_domain_ownership_uuid.java
View File

@ -18,7 +18,8 @@
*/ */
package db.migrations.org.libreccm.ccm_core; package db.migrations.org.libreccm.ccm_core;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.BaseJavaMigration;
import org.flywaydb.core.api.migration.Context;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -29,11 +30,13 @@ import java.util.UUID;
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_32__add_domain_ownership_uuid implements JdbcMigration { public class V7_0_0_32__add_domain_ownership_uuid extends BaseJavaMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
final Connection connection = context.getConnection();
final PreparedStatement retrieveOwnerships = connection final PreparedStatement retrieveOwnerships = connection
.prepareStatement("select OWNERSHIP_ID from CCM_CORE.DOMAIN_OWNERSHIPS"); .prepareStatement("select OWNERSHIP_ID from CCM_CORE.DOMAIN_OWNERSHIPS");

9
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_33__add_categorization_uuid.java
View File

@ -18,7 +18,8 @@
*/ */
package db.migrations.org.libreccm.ccm_core; package db.migrations.org.libreccm.ccm_core;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.BaseJavaMigration;
import org.flywaydb.core.api.migration.Context;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -29,10 +30,12 @@ import java.util.UUID;
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_33__add_categorization_uuid implements JdbcMigration { public class V7_0_0_33__add_categorization_uuid extends BaseJavaMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
final Connection connection = context.getConnection();
final PreparedStatement retrieveCategoriations = connection final PreparedStatement retrieveCategoriations = connection
.prepareStatement("select CATEGORIZATION_ID " .prepareStatement("select CATEGORIZATION_ID "

9
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_34__add_resourcetype_uuid.java
View File

@ -18,7 +18,8 @@
*/ */
package db.migrations.org.libreccm.ccm_core; package db.migrations.org.libreccm.ccm_core;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.BaseJavaMigration;
import org.flywaydb.core.api.migration.Context;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -29,10 +30,12 @@ import java.util.UUID;
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_34__add_resourcetype_uuid implements JdbcMigration { public class V7_0_0_34__add_resourcetype_uuid extends BaseJavaMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
final Connection connection = context.getConnection();
final PreparedStatement retrieveTypes = connection final PreparedStatement retrieveTypes = connection
.prepareStatement("select RESOURCE_TYPE_ID " .prepareStatement("select RESOURCE_TYPE_ID "

10
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_35__add_task_assignment_uuid.java
View File

@ -18,7 +18,8 @@
*/ */
package db.migrations.org.libreccm.ccm_core; package db.migrations.org.libreccm.ccm_core;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.BaseJavaMigration;
import org.flywaydb.core.api.migration.Context;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -29,11 +30,12 @@ import java.util.UUID;
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_35__add_task_assignment_uuid public class V7_0_0_35__add_task_assignment_uuid extends BaseJavaMigration {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
final Connection connection = context.getConnection();
final PreparedStatement retrieveAssignments = connection final PreparedStatement retrieveAssignments = connection
.prepareStatement("select TASK_ASSIGNMENT_ID " .prepareStatement("select TASK_ASSIGNMENT_ID "

9
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_36__add_task_dependency_uuid.java
View File

@ -18,7 +18,8 @@
*/ */
package db.migrations.org.libreccm.ccm_core; package db.migrations.org.libreccm.ccm_core;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.BaseJavaMigration;
import org.flywaydb.core.api.migration.Context;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
@ -29,10 +30,12 @@ import java.util.UUID;
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_36__add_task_dependency_uuid implements JdbcMigration { public class V7_0_0_36__add_task_dependency_uuid extends BaseJavaMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
final Connection connection = context.getConnection();
final PreparedStatement retrieveDependencies = connection final PreparedStatement retrieveDependencies = connection
.prepareStatement("select TASK_DEPENDENCY_ID " .prepareStatement("select TASK_DEPENDENCY_ID "

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_23__move_components_to_container_h2.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.h2; package db.migrations.org.libreccm.ccm_core.h2;
import db.migrations.org.libreccm.ccm_core.V7_0_0_23__move_components_to_container; import db.migrations.org.libreccm.ccm_core.V7_0_0_23__move_components_to_container;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_23__move_components_to_container_h2 public class V7_0_0_23__move_components_to_container_h2
extends V7_0_0_23__move_components_to_container extends V7_0_0_23__move_components_to_container {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_27__add_party_uuid_h2.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.h2; package db.migrations.org.libreccm.ccm_core.h2;
import db.migrations.org.libreccm.ccm_core.V7_0_0_27__add_party_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_27__add_party_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_27__add_party_uuid_h2 public class V7_0_0_27__add_party_uuid_h2
extends V7_0_0_27__add_party_uuid extends V7_0_0_27__add_party_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_28__add_role_uuid_h2.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.h2; package db.migrations.org.libreccm.ccm_core.h2;
import db.migrations.org.libreccm.ccm_core.V7_0_0_28__add_role_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_28__add_role_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_28__add_role_uuid_h2 public class V7_0_0_28__add_role_uuid_h2
extends V7_0_0_28__add_role_uuid extends V7_0_0_28__add_role_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_29__add_permission_uuid_h2.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.h2; package db.migrations.org.libreccm.ccm_core.h2;
import db.migrations.org.libreccm.ccm_core.V7_0_0_29__add_permission_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_29__add_permission_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_29__add_permission_uuid_h2 public class V7_0_0_29__add_permission_uuid_h2
extends V7_0_0_29__add_permission_uuid extends V7_0_0_29__add_permission_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_30__add_groupmembership_uuid_h2.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.h2; package db.migrations.org.libreccm.ccm_core.h2;
import db.migrations.org.libreccm.ccm_core.V7_0_0_30__add_groupmembership_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_30__add_groupmembership_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_30__add_groupmembership_uuid_h2 public class V7_0_0_30__add_groupmembership_uuid_h2
extends V7_0_0_30__add_groupmembership_uuid extends V7_0_0_30__add_groupmembership_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_31__add_rolemembership_uuid_h2.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.h2; package db.migrations.org.libreccm.ccm_core.h2;
import db.migrations.org.libreccm.ccm_core.V7_0_0_31__add_rolemembership_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_31__add_rolemembership_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_31__add_rolemembership_uuid_h2 public class V7_0_0_31__add_rolemembership_uuid_h2
extends V7_0_0_31__add_rolemembership_uuid extends V7_0_0_31__add_rolemembership_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_32__add_domain_ownership_uuid_h2.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.h2; package db.migrations.org.libreccm.ccm_core.h2;
import db.migrations.org.libreccm.ccm_core.V7_0_0_32__add_domain_ownership_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_32__add_domain_ownership_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_32__add_domain_ownership_uuid_h2 public class V7_0_0_32__add_domain_ownership_uuid_h2
extends V7_0_0_32__add_domain_ownership_uuid extends V7_0_0_32__add_domain_ownership_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_33__add_categorization_uuid_h2.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.h2; package db.migrations.org.libreccm.ccm_core.h2;
import db.migrations.org.libreccm.ccm_core.V7_0_0_33__add_categorization_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_33__add_categorization_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_33__add_categorization_uuid_h2 public class V7_0_0_33__add_categorization_uuid_h2
extends V7_0_0_33__add_categorization_uuid extends V7_0_0_33__add_categorization_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_34__add_resourcetype_uuid_h2.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.h2; package db.migrations.org.libreccm.ccm_core.h2;
import db.migrations.org.libreccm.ccm_core.V7_0_0_34__add_resourcetype_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_34__add_resourcetype_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_34__add_resourcetype_uuid_h2 public class V7_0_0_34__add_resourcetype_uuid_h2
extends V7_0_0_34__add_resourcetype_uuid extends V7_0_0_34__add_resourcetype_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_35__add_task_assignment_uuid_h2.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.h2; package db.migrations.org.libreccm.ccm_core.h2;
import db.migrations.org.libreccm.ccm_core.V7_0_0_35__add_task_assignment_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_35__add_task_assignment_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_35__add_task_assignment_uuid_h2 public class V7_0_0_35__add_task_assignment_uuid_h2
extends V7_0_0_35__add_task_assignment_uuid extends V7_0_0_35__add_task_assignment_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_36__add_task_dependency_uuid_h2.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.h2; package db.migrations.org.libreccm.ccm_core.h2;
import db.migrations.org.libreccm.ccm_core.V7_0_0_36__add_task_dependency_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_36__add_task_dependency_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_36__add_task_dependency_uuid_h2 public class V7_0_0_36__add_task_dependency_uuid_h2
extends V7_0_0_36__add_task_dependency_uuid extends V7_0_0_36__add_task_dependency_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_23__move_components_to_container_pgsql.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.pgsql; package db.migrations.org.libreccm.ccm_core.pgsql;
import db.migrations.org.libreccm.ccm_core.V7_0_0_23__move_components_to_container; import db.migrations.org.libreccm.ccm_core.V7_0_0_23__move_components_to_container;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_23__move_components_to_container_pgsql public class V7_0_0_23__move_components_to_container_pgsql
extends V7_0_0_23__move_components_to_container extends V7_0_0_23__move_components_to_container {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

10
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_27__add_party_uuid_pgsql.java
View File

@ -19,21 +19,19 @@
package db.migrations.org.libreccm.ccm_core.pgsql; package db.migrations.org.libreccm.ccm_core.pgsql;
import db.migrations.org.libreccm.ccm_core.V7_0_0_27__add_party_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_27__add_party_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
import java.sql.Connection; import org.flywaydb.core.api.migration.Context;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_27__add_party_uuid_pgsql public class V7_0_0_27__add_party_uuid_pgsql
extends V7_0_0_27__add_party_uuid extends V7_0_0_27__add_party_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_28__add_role_uuid_pgsql.java
View File

@ -18,23 +18,20 @@
*/ */
package db.migrations.org.libreccm.ccm_core.pgsql; package db.migrations.org.libreccm.ccm_core.pgsql;
import db.migrations.org.libreccm.ccm_core.h2.*;
import db.migrations.org.libreccm.ccm_core.V7_0_0_28__add_role_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_28__add_role_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_28__add_role_uuid_pgsql public class V7_0_0_28__add_role_uuid_pgsql
extends V7_0_0_28__add_role_uuid extends V7_0_0_28__add_role_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

12
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_29__add_permission_uuid_pgsql.java
View File

@ -18,23 +18,19 @@
*/ */
package db.migrations.org.libreccm.ccm_core.pgsql; package db.migrations.org.libreccm.ccm_core.pgsql;
import db.migrations.org.libreccm.ccm_core.h2.*;
import db.migrations.org.libreccm.ccm_core.V7_0_0_29__add_permission_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_29__add_permission_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_29__add_permission_uuid_pgsql public class V7_0_0_29__add_permission_uuid_pgsql
extends V7_0_0_29__add_permission_uuid extends V7_0_0_29__add_permission_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_30__add_groupmembership_uuid_pgsql.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.pgsql; package db.migrations.org.libreccm.ccm_core.pgsql;
import db.migrations.org.libreccm.ccm_core.V7_0_0_30__add_groupmembership_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_30__add_groupmembership_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_30__add_groupmembership_uuid_pgsql public class V7_0_0_30__add_groupmembership_uuid_pgsql
extends V7_0_0_30__add_groupmembership_uuid extends V7_0_0_30__add_groupmembership_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_31__add_rolemembership_uuid_pgsql.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.pgsql; package db.migrations.org.libreccm.ccm_core.pgsql;
import db.migrations.org.libreccm.ccm_core.V7_0_0_31__add_rolemembership_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_31__add_rolemembership_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_31__add_rolemembership_uuid_pgsql public class V7_0_0_31__add_rolemembership_uuid_pgsql
extends V7_0_0_31__add_rolemembership_uuid extends V7_0_0_31__add_rolemembership_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_32__add_domain_ownership_uuid_pgsql.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.pgsql; package db.migrations.org.libreccm.ccm_core.pgsql;
import db.migrations.org.libreccm.ccm_core.V7_0_0_32__add_domain_ownership_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_32__add_domain_ownership_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_32__add_domain_ownership_uuid_pgsql public class V7_0_0_32__add_domain_ownership_uuid_pgsql
extends V7_0_0_32__add_domain_ownership_uuid extends V7_0_0_32__add_domain_ownership_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

12
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_33__add_categorization_uuid_pgsql.java
View File

@ -18,23 +18,19 @@
*/ */
package db.migrations.org.libreccm.ccm_core.pgsql; package db.migrations.org.libreccm.ccm_core.pgsql;
import db.migrations.org.libreccm.ccm_core.h2.*;
import db.migrations.org.libreccm.ccm_core.V7_0_0_33__add_categorization_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_33__add_categorization_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_33__add_categorization_uuid_pgsql public class V7_0_0_33__add_categorization_uuid_pgsql
extends V7_0_0_33__add_categorization_uuid extends V7_0_0_33__add_categorization_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

12
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_34__add_resourcetype_uuid_pgsql.java
View File

@ -18,23 +18,19 @@
*/ */
package db.migrations.org.libreccm.ccm_core.pgsql; package db.migrations.org.libreccm.ccm_core.pgsql;
import db.migrations.org.libreccm.ccm_core.h2.*;
import db.migrations.org.libreccm.ccm_core.V7_0_0_34__add_resourcetype_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_34__add_resourcetype_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_34__add_resourcetype_uuid_pgsql public class V7_0_0_34__add_resourcetype_uuid_pgsql
extends V7_0_0_34__add_resourcetype_uuid extends V7_0_0_34__add_resourcetype_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_35__add_task_assignment_uuid_pgsql.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.pgsql; package db.migrations.org.libreccm.ccm_core.pgsql;
import db.migrations.org.libreccm.ccm_core.V7_0_0_35__add_task_assignment_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_35__add_task_assignment_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_35__add_task_assignment_uuid_pgsql public class V7_0_0_35__add_task_assignment_uuid_pgsql
extends V7_0_0_35__add_task_assignment_uuid extends V7_0_0_35__add_task_assignment_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

11
ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_36__add_task_dependency_uuid_pgsql.java
View File

@ -19,21 +19,18 @@
package db.migrations.org.libreccm.ccm_core.pgsql; package db.migrations.org.libreccm.ccm_core.pgsql;
import db.migrations.org.libreccm.ccm_core.V7_0_0_36__add_task_dependency_uuid; import db.migrations.org.libreccm.ccm_core.V7_0_0_36__add_task_dependency_uuid;
import org.flywaydb.core.api.migration.jdbc.JdbcMigration; import org.flywaydb.core.api.migration.Context;
import java.sql.Connection;
/** /**
* *
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
public class V7_0_0_36__add_task_dependency_uuid_pgsql public class V7_0_0_36__add_task_dependency_uuid_pgsql
extends V7_0_0_36__add_task_dependency_uuid extends V7_0_0_36__add_task_dependency_uuid {
implements JdbcMigration {
@Override @Override
public void migrate(final Connection connection) throws Exception { public void migrate(final Context context) throws Exception {
super.migrate(connection); super.migrate(context);
} }
} }

1
ccm-core/src/main/java/org/libreccm/core/api/JsonArrayCollector.java
View File

@ -18,7 +18,6 @@
*/ */
package org.libreccm.core.api; package org.libreccm.core.api;
import com.google.common.collect.Sets;
import java.util.Collections; import java.util.Collections;
import java.util.Set; import java.util.Set;

7
ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.libreccm.categorization; package org.libreccm.categorization;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObject;
@ -54,8 +54,9 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(
final SingleTypeEqualsVerifierApi<?> verifier
) {
final Category category1 = new Category(); final Category category1 = new Category();
category1.setName("Category One"); category1.setName("Category One");

4
ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.libreccm.core; package org.libreccm.core;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest; import org.libreccm.tests.categories.UnitTest;
@ -54,7 +54,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final CcmObject ccmObject1 = new CcmObject(); final CcmObject ccmObject1 = new CcmObject();
ccmObject1.setObjectId(-100); ccmObject1.setObjectId(-100);

4
ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.libreccm.core; package org.libreccm.core;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category; import org.libreccm.categorization.Category;
@ -57,7 +57,7 @@ public class ResourceEntityTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Resource resource1 = new Resource(); final Resource resource1 = new Resource();
final LocalizedString title1 = new LocalizedString(); final LocalizedString title1 = new LocalizedString();

4
ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.libreccm.formbuilder; package org.libreccm.formbuilder;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category; import org.libreccm.categorization.Category;
@ -62,7 +62,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Component component1 = new Component(); final Component component1 = new Component();
component1.setAdminName("Component One"); component1.setAdminName("Component One");

4
ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.libreccm.formbuilder.actions; package org.libreccm.formbuilder.actions;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.formbuilder.Component; import org.libreccm.formbuilder.Component;
@ -60,7 +60,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Component component1 = new Component(); final Component component1 = new Component();
component1.setAdminName("Component One"); component1.setAdminName("Component One");

4
ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.libreccm.l10n; package org.libreccm.l10n;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
@ -49,7 +49,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Message message1 = new Message(); final Message message1 = new Message();
message1.setSubject("Message One"); message1.setSubject("Message One");

4
ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.libreccm.messaging; package org.libreccm.messaging;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category; import org.libreccm.categorization.Category;
@ -54,7 +54,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Message message1 = new Message(); final Message message1 = new Message();
message1.setSubject("Message One"); message1.setSubject("Message One");

4
ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.libreccm.notification; package org.libreccm.notification;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category; import org.libreccm.categorization.Category;
@ -55,7 +55,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Message message1 = new Message(); final Message message1 = new Message();
message1.setSubject("Message One"); message1.setSubject("Message One");

4
ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.libreccm.portal; package org.libreccm.portal;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category; import org.libreccm.categorization.Category;
@ -53,7 +53,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Portal portal1 = new Portal(); final Portal portal1 = new Portal();
portal1.setDisplayName("Portal One"); portal1.setDisplayName("Portal One");

4
ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.libreccm.runtime; package org.libreccm.runtime;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest; import org.libreccm.tests.categories.UnitTest;
@ -47,7 +47,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Initalizer initalizer1 = new Initalizer(); final Initalizer initalizer1 = new Initalizer();
initalizer1.setClassName("org.example.foo.Initalizer"); initalizer1.setClassName("org.example.foo.Initalizer");

4
ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.libreccm.search.lucene; package org.libreccm.search.lucene;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.security.Group; import org.libreccm.security.Group;
@ -50,7 +50,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Document document1 = new Document(); final Document document1 = new Document();
document1.setTitle("document1"); document1.setTitle("document1");

4
ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.libreccm.security; package org.libreccm.security;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObject;
@ -56,7 +56,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Group group1 = new Group(); final Group group1 = new Group();
group1.setName("group1"); group1.setName("group1");

4
ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.libreccm.theming.db; package org.libreccm.theming.db;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.tests.categories.UnitTest; import org.libreccm.tests.categories.UnitTest;
@ -51,7 +51,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
Objects.requireNonNull(verifier); Objects.requireNonNull(verifier);

4
ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.libreccm.web; package org.libreccm.web;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.libreccm.categorization.Category; import org.libreccm.categorization.Category;
@ -55,7 +55,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
final Resource resource1 = new Resource(); final Resource resource1 = new Resource();
resource1.setDisplayName("Resource One"); resource1.setDisplayName("Resource One");

4
ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java
View File

@ -18,7 +18,7 @@
*/ */
package org.libreccm.workflow; package org.libreccm.workflow;
import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
@ -57,7 +57,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
} }
@Override @Override
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
super.addPrefabValues(verifier); super.addPrefabValues(verifier);

4
ccm-docrepo/pom.xml
View File

@ -49,7 +49,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -266,12 +266,10 @@
<!--<plugin> <!--<plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>javancss-maven-plugin</artifactId> <artifactId>javancss-maven-plugin</artifactId>
<version>2.1</version>
</plugin>--> </plugin>-->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId> <artifactId>maven-project-info-reports-plugin</artifactId>
<!--<version>2.9</version>-->
<reportSets> <reportSets>
<reportSet> <reportSet>
<reports> <reports>

3
ccm-shortcuts/pom.xml
View File

@ -57,7 +57,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -307,7 +307,6 @@
<!--<plugin> <!--<plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>javancss-maven-plugin</artifactId> <artifactId>javancss-maven-plugin</artifactId>
<version>2.1</version>
</plugin>--> </plugin>-->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

10
ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java
View File

@ -18,8 +18,8 @@
*/ */
package org.libreccm.testutils; package org.libreccm.testutils;
import nl.jqno.equalsverifier.EqualsVerifierApi;
import nl.jqno.equalsverifier.Warning; import nl.jqno.equalsverifier.Warning;
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
import org.junit.Test; import org.junit.Test;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
@ -89,7 +89,9 @@ public class EqualsVerifier {
* *
* @param verifier The verifier to which the suppression are added. * @param verifier The verifier to which the suppression are added.
*/ */
protected void addSuppressWarnings(final EqualsVerifierApi<?> verifier) { protected void addSuppressWarnings(
final SingleTypeEqualsVerifierApi<?> verifier
) {
verifier verifier
.suppress(Warning.STRICT_INHERITANCE) .suppress(Warning.STRICT_INHERITANCE)
@ -102,14 +104,14 @@ public class EqualsVerifier {
* *
* @param verifier The verifier to which the prefab values are added. * @param verifier The verifier to which the prefab values are added.
*/ */
protected void addPrefabValues(final EqualsVerifierApi<?> verifier) { protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
//Nothing here //Nothing here
} }
@Test @Test
public void verifyEqualsAndHashCode() { public void verifyEqualsAndHashCode() {
final EqualsVerifierApi<?> verifier final SingleTypeEqualsVerifierApi<?> verifier
= nl.jqno.equalsverifier.EqualsVerifier = nl.jqno.equalsverifier.EqualsVerifier
.forClass(entityClass) .forClass(entityClass)
.withRedefinedSuperclass(); .withRedefinedSuperclass();

156
pom.xml
View File

@ -153,7 +153,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version> <version>3.3.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -163,7 +163,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version> <version>3.8.1</version>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
@ -180,27 +180,27 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId> <artifactId>maven-ear-plugin</artifactId>
<version>3.0.1</version> <version>3.0.2</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version> <version>3.0.0-M3</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.1.1</version> <version>3.2.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version> <version>3.2.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId> <artifactId>maven-pmd-plugin</artifactId>
<version>3.11.0</version> <version>3.13.0</version>
<configuration> <configuration>
<linkXref>true</linkXref> <linkXref>true</linkXref>
<sourceEncoding>utf-8</sourceEncoding> <sourceEncoding>utf-8</sourceEncoding>
@ -236,17 +236,17 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId> <artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.0.0</version> <version>3.1.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version> <version>3.0.0-M1</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M3</version> <version>3.0.0-M4</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -256,7 +256,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>3.2.2</version> <version>3.3.0</version>
</plugin> </plugin>
<!-- <!--
@ -265,17 +265,17 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version> <version>3.0.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.github.eirslett</groupId> <groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId> <artifactId>frontend-maven-plugin</artifactId>
<version>1.7.6</version> <version>1.10.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.github.spotbugs</groupId> <groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId> <artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.11</version> <version>4.0.0</version>
<configuration> <configuration>
<findbugsXmlOutput>true</findbugsXmlOutput> <findbugsXmlOutput>true</findbugsXmlOutput>
<xmlOutput>true</xmlOutput> <xmlOutput>true</xmlOutput>
@ -297,12 +297,12 @@
<plugin> <plugin>
<groupId>io.thorntail</groupId> <groupId>io.thorntail</groupId>
<artifactId>thorntail-maven-plugin</artifactId> <artifactId>thorntail-maven-plugin</artifactId>
<version>2.4.0.Final</version> <version>2.7.0.Final</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version> <version>3.1.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
@ -312,12 +312,12 @@
<plugin> <plugin>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.3</version> <version>0.8.5</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.wildfly.plugins</groupId> <groupId>org.wildfly.plugins</groupId>
<artifactId>wildfly-maven-plugin</artifactId> <artifactId>wildfly-maven-plugin</artifactId>
<version>2.0.1.Final</version> <version>2.0.2.Final</version>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
@ -326,7 +326,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<configuration> <configuration>
<excludeDefaultDirectories>true</excludeDefaultDirectories> <excludeDefaultDirectories>true</excludeDefaultDirectories>
<filesets> <filesets>
@ -419,7 +418,7 @@
<dependency> <dependency>
<groupId>io.thorntail</groupId> <groupId>io.thorntail</groupId>
<artifactId>bom</artifactId> <artifactId>bom</artifactId>
<version>2.4.0.Final</version> <version>2.7.0.Final</version>
<scope>import</scope> <scope>import</scope>
<type>pom</type> <type>pom</type>
</dependency> </dependency>
@ -433,7 +432,7 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId> <artifactId>hibernate-core</artifactId>
<version>5.3.15.Final</version> <version>5.3.17.Final</version>
</dependency> </dependency>
<!-- <!--
@ -443,22 +442,23 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId> <artifactId>hibernate-envers</artifactId>
<version>5.3.15.Final</version> <version>5.3.17.Final</version>
</dependency> </dependency>
<!-- <!--
Hibernate Validator used as implemenation of the Bean Hibernate Validator used as implemenation of the Bean
Validation API --> Validation API -->
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
<version>6.0.18.Final</version> <version>6.1.5.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId> <artifactId>hibernate-validator-cdi</artifactId>
<version>6.0.18.Final</version> <version>6.1.5.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.el</groupId> <groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId> <artifactId>javax.el-api</artifactId>
@ -477,7 +477,7 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-search-orm</artifactId> <artifactId>hibernate-search-orm</artifactId>
<version>5.10.7.Final</version> <version>5.11.5.Final</version>
</dependency> </dependency>
<!-- <!--
@ -486,7 +486,7 @@
<dependency> <dependency>
<groupId>org.flywaydb</groupId> <groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId> <artifactId>flyway-core</artifactId>
<version>5.2.4</version> <version>6.4.4</version>
</dependency> </dependency>
<!-- <!--
@ -508,29 +508,29 @@
<dependency> <dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId> <artifactId>shiro-core</artifactId>
<version>1.4.0</version> <version>1.5.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId> <artifactId>shiro-web</artifactId>
<version>1.4.0</version> <version>1.5.3</version>
</dependency> </dependency>
<!-- Json Web Token support --> <!-- Json Web Token support -->
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId> <artifactId>jjwt-api</artifactId>
<version>0.10.6</version> <version>0.11.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId> <artifactId>jjwt-impl</artifactId>
<version>0.10.6</version> <version>0.11.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId> <artifactId>jjwt-jackson</artifactId>
<version>0.10.6</version> <version>0.11.2</version>
</dependency> </dependency>
<!-- <!--
@ -550,7 +550,7 @@
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId> <artifactId>log4j-bom</artifactId>
<version>2.11.2</version> <version>2.13.3</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@ -562,13 +562,13 @@
<dependency> <dependency>
<groupId>org.apache.lucene</groupId> <groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId> <artifactId>lucene-core</artifactId>
<version>8.0.0</version> <version>8.5.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.pdfbox</groupId> <groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId> <artifactId>pdfbox</artifactId>
<version>2.0.15</version> <version>2.0.20</version>
</dependency> </dependency>
@ -576,7 +576,7 @@
<dependency> <dependency>
<groupId>commons-beanutils</groupId> <groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId> <artifactId>commons-beanutils</artifactId>
<version>1.9.3</version> <version>1.9.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-cli</groupId> <groupId>commons-cli</groupId>
@ -586,7 +586,7 @@
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>1.12</version> <version>1.14</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
@ -606,7 +606,7 @@
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.6</version> <version>2.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-lang</groupId> <groupId>commons-lang</groupId>
@ -634,19 +634,19 @@
<dependency> <dependency>
<groupId>org.reflections</groupId> <groupId>org.reflections</groupId>
<artifactId>reflections</artifactId> <artifactId>reflections</artifactId>
<version>0.9.11</version> <version>0.9.12</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.freemarker</groupId> <groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId> <artifactId>freemarker</artifactId>
<version>2.3.28</version> <version>2.3.30</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.saxon</groupId> <groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId> <artifactId>Saxon-HE</artifactId>
<version>9.9.1-2</version> <version>10.1</version>
</dependency> </dependency>
<dependency> <dependency>
@ -664,13 +664,13 @@
<dependency> <dependency>
<groupId>org.jsoup</groupId> <groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId> <artifactId>jsoup</artifactId>
<version>1.11.3</version> <version>1.13.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>3.6.1</version> <version>3.6.3</version>
</dependency> </dependency>
<dependency> <dependency>
@ -718,16 +718,16 @@
<dependency> <dependency>
<groupId>com.fasterxml.jackson</groupId> <groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId> <artifactId>jackson-bom</artifactId>
<version>2.9.8</version> <version>2.11.0</version>
<scope>import</scope> <scope>import</scope>
<type>pom</type> <type>pom</type>
</dependency> </dependency>
<!-- better xml library --> <!-- PostgreSQL JDBC Driver -->
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>org.postgresql</groupId>
<artifactId>woodstox-core-asl</artifactId> <artifactId>postgresql</artifactId>
<version>4.4.1</version> <version>42.2.14</version>
</dependency> </dependency>
<!-- <!--
@ -739,7 +739,7 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.12</version> <version>4.13</version>
</dependency> </dependency>
<!-- <!--
@ -749,7 +749,7 @@
<dependency> <dependency>
<groupId>org.jboss.arquillian</groupId> <groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId> <artifactId>arquillian-bom</artifactId>
<version>1.4.1.Final</version> <version>1.6.0.Final</version>
<scope>import</scope> <scope>import</scope>
<type>pom</type> <type>pom</type>
</dependency> </dependency>
@ -766,7 +766,7 @@
<dependency> <dependency>
<groupId>org.jboss.arquillian.extension</groupId> <groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-jacoco</artifactId> <artifactId>arquillian-jacoco</artifactId>
<version>1.0.0.Alpha10</version> <version>1.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wildfly.arquillian</groupId> <groupId>org.wildfly.arquillian</groupId>
@ -781,13 +781,54 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-embedded</artifactId>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-embedded</artifactId>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
<version>2.1.16.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-webservices</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-jaxrs</artifactId>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
<version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
<version>1.7.5</version>
</dependency>
<!-- <!--
JaCoCo is used to measure the test coverage JaCoCo is used to measure the test coverage
--> -->
<dependency> <dependency>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>org.jacoco.core</artifactId> <artifactId>org.jacoco.core</artifactId>
<version>0.8.3</version> <version>0.8.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -798,12 +839,12 @@
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest-core</artifactId>
<version>2.1</version> <version>2.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId> <artifactId>hamcrest-library</artifactId>
<version>2.1</version> <version>2.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -815,15 +856,14 @@
<dependency> <dependency>
<groupId>nl.jqno.equalsverifier</groupId> <groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId> <artifactId>equalsverifier</artifactId>
<!--<version>1.7.8</version>--> <version>3.4</version>
<version>3.1.9</version>
</dependency> </dependency>
<!-- h2 database in used to check some database related things --> <!-- h2 database in used to check some database related things -->
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
<version>1.4.199</version> <version>1.4.200</version>
</dependency> </dependency>
<!-- WebJars --> <!-- WebJars -->