diff --git a/ccm-archetype-module/pom.xml b/ccm-archetype-module/pom.xml index 5d2a09390..158f56063 100644 --- a/ccm-archetype-module/pom.xml +++ b/ccm-archetype-module/pom.xml @@ -12,7 +12,7 @@ ccm-archetype-module 7.0.0-SNAPSHOT - LibreCCM Module archetype + LibreCCM Module Archetype http://www.libreccm.org/devel/modules diff --git a/ccm-bundle-devel-thorntail/pom.xml b/ccm-bundle-devel-thorntail/pom.xml index dc1a04f60..6178bfbf9 100644 --- a/ccm-bundle-devel-thorntail/pom.xml +++ b/ccm-bundle-devel-thorntail/pom.xml @@ -3,12 +3,6 @@ 4.0.0 - - org.libreccm ccm-bundle-devel @@ -142,17 +136,14 @@ org.webjars font-awesome - 4.7.0 org.webjars requirejs - 2.3.6 org.webjars requirejs-domready - 2.0.1-2 diff --git a/ccm-bundle-devel-wildfly-web/pom.xml b/ccm-bundle-devel-wildfly-web/pom.xml index 821c5b196..fc67502c2 100644 --- a/ccm-bundle-devel-wildfly-web/pom.xml +++ b/ccm-bundle-devel-wildfly-web/pom.xml @@ -26,28 +26,19 @@ org.webjars font-awesome - org.webjars requirejs - org.webjars requirejs-domready - org.webjars.npm tinymce - - org.librecms ccm-cms-pagemodelseditor @@ -103,15 +94,6 @@ v8.11.4 - npm link @librecms/ccm-cms-pagemodelseditor diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml index 879f9eedc..6f3826c43 100644 --- a/ccm-bundle-devel-wildfly/pom.xml +++ b/ccm-bundle-devel-wildfly/pom.xml @@ -121,7 +121,6 @@ org.postgresql postgresql - 9.4.1208 diff --git a/ccm-cms-profile/pom.xml b/ccm-cms-profile/pom.xml index 68bd8de80..719f6f624 100644 --- a/ccm-cms-profile/pom.xml +++ b/ccm-cms-profile/pom.xml @@ -64,12 +64,12 @@ - org.hibernate + org.hibernate.validator hibernate-validator provided - org.hibernate + org.hibernate.validator hibernate-validator-cdi provided diff --git a/ccm-cms-types-agenda/pom.xml b/ccm-cms-types-agenda/pom.xml index 219f09afa..4e9388de8 100644 --- a/ccm-cms-types-agenda/pom.xml +++ b/ccm-cms-types-agenda/pom.xml @@ -64,12 +64,12 @@ - org.hibernate + org.hibernate.validator hibernate-validator provided - org.hibernate + org.hibernate.validator hibernate-validator-cdi provided diff --git a/ccm-cms-types-bookmark/pom.xml b/ccm-cms-types-bookmark/pom.xml index 8b2864abf..5dcc2a0e4 100644 --- a/ccm-cms-types-bookmark/pom.xml +++ b/ccm-cms-types-bookmark/pom.xml @@ -64,12 +64,12 @@ - org.hibernate + org.hibernate.validator hibernate-validator provided - org.hibernate + org.hibernate.validator hibernate-validator-cdi provided diff --git a/ccm-cms-types-decisiontree/pom.xml b/ccm-cms-types-decisiontree/pom.xml index 9f6d92b69..c2511c0bd 100644 --- a/ccm-cms-types-decisiontree/pom.xml +++ b/ccm-cms-types-decisiontree/pom.xml @@ -64,12 +64,12 @@ - org.hibernate + org.hibernate.validator hibernate-validator provided - org.hibernate + org.hibernate.validator hibernate-validator-cdi provided diff --git a/ccm-cms-types-externallink/pom.xml b/ccm-cms-types-externallink/pom.xml index a8abc8176..c89d7d9da 100644 --- a/ccm-cms-types-externallink/pom.xml +++ b/ccm-cms-types-externallink/pom.xml @@ -64,12 +64,12 @@ - org.hibernate + org.hibernate.validator hibernate-validator provided - org.hibernate + org.hibernate.validator hibernate-validator-cdi provided diff --git a/ccm-cms-types-faqitem/pom.xml b/ccm-cms-types-faqitem/pom.xml index e00e7566d..c55cbf3d6 100644 --- a/ccm-cms-types-faqitem/pom.xml +++ b/ccm-cms-types-faqitem/pom.xml @@ -64,12 +64,12 @@ - org.hibernate + org.hibernate.validator hibernate-validator provided - org.hibernate + org.hibernate.validator hibernate-validator-cdi provided diff --git a/ccm-cms-types-glossaryitem/pom.xml b/ccm-cms-types-glossaryitem/pom.xml index b03b61df9..42a41978c 100644 --- a/ccm-cms-types-glossaryitem/pom.xml +++ b/ccm-cms-types-glossaryitem/pom.xml @@ -64,12 +64,12 @@ - org.hibernate + org.hibernate.validator hibernate-validator provided - org.hibernate + org.hibernate.validator hibernate-validator-cdi provided diff --git a/ccm-cms-types-minutes/pom.xml b/ccm-cms-types-minutes/pom.xml index 38113079b..323e70313 100644 --- a/ccm-cms-types-minutes/pom.xml +++ b/ccm-cms-types-minutes/pom.xml @@ -64,12 +64,12 @@ - org.hibernate + org.hibernate.validator hibernate-validator provided - org.hibernate + org.hibernate.validator hibernate-validator-cdi provided diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml index dd99ce800..cd97d977a 100644 --- a/ccm-cms/pom.xml +++ b/ccm-cms/pom.xml @@ -55,12 +55,12 @@ - org.hibernate + org.hibernate.validator hibernate-validator provided - org.hibernate + org.hibernate.validator hibernate-validator-cdi provided diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeAdminPaneController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeAdminPaneController.java index 195160ddc..5b60a7236 100644 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeAdminPaneController.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeAdminPaneController.java @@ -18,7 +18,6 @@ */ package com.arsdigita.cms.ui.type; -import com.ibm.icu.impl.IllegalIcuArgumentException; import org.libreccm.workflow.Workflow; import org.librecms.contentsection.ContentSection; import org.librecms.contentsection.ContentSectionManager; @@ -90,7 +89,7 @@ class ContentTypeAdminPaneController { ofSection.getObjectId() ) .orElseThrow( - () -> new IllegalIcuArgumentException( + () -> new IllegalArgumentException( String.format( "No ContentSection with ID %d found.", ofSection.getObjectId() diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java index a7f53feaf..c84168f6d 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.librecms.contentsection; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.categorization.Category; @@ -55,7 +55,7 @@ public class AssetEqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { final CcmObject object1 = new CcmObject(); object1.setDisplayName("Object 1"); diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java index dc18a1367..f0122fb1e 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.librecms.contentsection; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.core.CcmObject; @@ -55,7 +55,7 @@ public class AttachmentsEqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { final ContentSection section1 = new ContentSection(); section1.setDisplayName("section1"); diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java index 913a09dcf..cec043aa3 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.librecms.contentsection; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.categorization.Category; @@ -59,7 +59,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { final ContentItem item1 = new ContentItem(); item1.setObjectId(-1100); diff --git a/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java index 0353ce46b..80b7b94fa 100644 --- a/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java +++ b/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.librecms.contenttypes; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import java.util.Arrays; import java.util.Collection; @@ -50,7 +50,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { } } diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index 4832d8742..1c9dce4c4 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -49,12 +49,12 @@ - org.hibernate + org.hibernate.validator hibernate-validator provided - org.hibernate + org.hibernate.validator hibernate-validator-cdi provided @@ -215,7 +215,6 @@ org.reflections reflections - - org.codehaus.woodstox - woodstox-core-asl - com.fasterxml.jackson.dataformat jackson-dataformat-csv @@ -572,13 +567,11 @@ org.apache.openejb arquillian-tomee-embedded - 1.7.3 test org.apache.openejb tomee-embedded - 1.7.3 test @@ -610,19 +603,16 @@ org.jboss.logmanager jboss-logmanager - 2.0.3.Final test org.apache.openejb tomee-webservices - 4.0.0 org.apache.openejb tomee-jaxrs - 1.7.3 com.h2database @@ -702,12 +692,10 @@ org.apache.openejb arquillian-tomee-remote - 1.7.3 org.apache.openejb apache-tomee - 1.7.3 plus zip diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_23__move_components_to_container.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_23__move_components_to_container.java index 29cdfbdb5..6ad89b454 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_23__move_components_to_container.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_23__move_components_to_container.java @@ -18,7 +18,8 @@ */ 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.PreparedStatement; @@ -29,10 +30,12 @@ import java.util.UUID; * * @author Jens Pelzetter */ -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 - 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 final PreparedStatement retrievePageModels = connection @@ -41,14 +44,12 @@ public class V7_0_0_23__move_components_to_container implements JdbcMigration { + "where VERSION = 'DRAFT'"); - /* - For each PageModel: - * Create a single container (by inserting the data into - ccm_core.page_model_container_models) - * set container_id of each component_model of the page_model - to the ID of the new container - * if the PageModel has a public version do the same but reuse the - containerUuid + /* + * For each PageModel: Create a single container (by inserting the data + * into ccm_core.page_model_container_models) set container_id of each + * component_model of the page_model to the ID of the new container if + * the PageModel has a public version do the same but reuse the + * containerUuid */ final PreparedStatement createContainerId = connection .prepareStatement("select nextval('hibernate_sequence')"); @@ -87,8 +88,8 @@ public class V7_0_0_23__move_components_to_container implements JdbcMigration { + " where PAGE_MODEL_ID = ?" + ")"); try (final ResultSet pageModelsResultSet - = retrievePageModels.executeQuery()) { - + = retrievePageModels.executeQuery()) { + while (pageModelsResultSet.next()) { final long pageModelId = pageModelsResultSet @@ -101,7 +102,7 @@ public class V7_0_0_23__move_components_to_container implements JdbcMigration { final long containerId; try (final ResultSet containerIdResultSet - = createContainerId.executeQuery()) { + = createContainerId.executeQuery()) { containerIdResultSet.next(); containerId = containerIdResultSet.getLong("nextval"); @@ -121,8 +122,8 @@ public class V7_0_0_23__move_components_to_container implements JdbcMigration { checkForLivePageModel.setString(1, modelUuid); final long liveCount; try (final ResultSet liveCountResultSet - = checkForLivePageModel.executeQuery()) { - + = checkForLivePageModel.executeQuery()) { + liveCountResultSet.next(); liveCount = liveCountResultSet.getLong("COUNT"); } @@ -131,14 +132,14 @@ public class V7_0_0_23__move_components_to_container implements JdbcMigration { retrieveLivePage.setString(1, modelUuid); final long livePageModelId; try (final ResultSet liveResultSet - = retrieveLivePage.executeQuery()) { + = retrieveLivePage.executeQuery()) { liveResultSet.next(); livePageModelId = liveResultSet.getLong("PAGE_MODEL_ID"); } final long liveContainerId; try (final ResultSet liveContainerIdResultSet - = createContainerId.executeQuery()) { + = createContainerId.executeQuery()) { liveContainerIdResultSet.next(); liveContainerId = liveContainerIdResultSet .getLong("nextval"); diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_27__add_party_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_27__add_party_uuid.java index b01623b3d..78a6494af 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_27__add_party_uuid.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_27__add_party_uuid.java @@ -1,6 +1,7 @@ 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.PreparedStatement; @@ -10,29 +11,30 @@ import java.util.UUID; /* * Copyright (C) 2018 LibreCCM Foundation. * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. + * This library is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 2.1 of the License, or (at your option) + * any later version. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * This library is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** * * @author Jens Pelzetter */ -public class V7_0_0_27__add_party_uuid implements JdbcMigration { +public class V7_0_0_27__add_party_uuid extends BaseJavaMigration { @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 .prepareStatement("select PARTY_ID from CCM_CORE.PARTIES"); @@ -58,14 +60,14 @@ public class V7_0_0_27__add_party_uuid implements JdbcMigration { final ResultSet partyIds = retrieveParties.executeQuery(); addUuidCol.execute(); - - while(partyIds.next()) { - + + while (partyIds.next()) { + setUuid.setString(1, UUID.randomUUID().toString()); setUuid.setLong(2, partyIds.getLong("PARTY_ID")); setUuid.executeUpdate(); } - + addUuidNotNull.execute(); addUniqueConstraint.execute(); diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_28__add_role_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_28__add_role_uuid.java index 27228632b..a3b149dc4 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_28__add_role_uuid.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_28__add_role_uuid.java @@ -18,7 +18,9 @@ */ 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.PreparedStatement; @@ -29,11 +31,13 @@ import java.util.UUID; * * @author Jens Pelzetter */ -public class V7_0_0_28__add_role_uuid implements JdbcMigration { +public class V7_0_0_28__add_role_uuid extends BaseJavaMigration { @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 .prepareStatement("select ROLE_ID from CCM_CORE.CCM_ROLES"); diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_29__add_permission_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_29__add_permission_uuid.java index dde93020e..f91161c1e 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_29__add_permission_uuid.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_29__add_permission_uuid.java @@ -18,7 +18,8 @@ */ 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.PreparedStatement; @@ -29,11 +30,13 @@ import java.util.UUID; * * @author Jens Pelzetter */ -public class V7_0_0_29__add_permission_uuid implements JdbcMigration { +public class V7_0_0_29__add_permission_uuid extends BaseJavaMigration { @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 .prepareStatement("select PERMISSION_ID from CCM_CORE.PERMISSIONS"); diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_30__add_groupmembership_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_30__add_groupmembership_uuid.java index 368b15d01..d48d3be40 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_30__add_groupmembership_uuid.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_30__add_groupmembership_uuid.java @@ -18,7 +18,8 @@ */ 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.PreparedStatement; @@ -29,11 +30,13 @@ import java.util.UUID; * * @author Jens Pelzetter */ -public class V7_0_0_30__add_groupmembership_uuid implements JdbcMigration { +public class V7_0_0_30__add_groupmembership_uuid extends BaseJavaMigration { @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 .prepareStatement("select MEMBERSHIP_ID " + "from CCM_CORE.GROUP_MEMBERSHIPS"); diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_31__add_rolemembership_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_31__add_rolemembership_uuid.java index c845eb04a..216c3f553 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_31__add_rolemembership_uuid.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_31__add_rolemembership_uuid.java @@ -18,7 +18,8 @@ */ 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.PreparedStatement; @@ -29,11 +30,13 @@ import java.util.UUID; * * @author Jens Pelzetter */ -public class V7_0_0_31__add_rolemembership_uuid implements JdbcMigration { +public class V7_0_0_31__add_rolemembership_uuid extends BaseJavaMigration { @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 .prepareStatement("select MEMBERSHIP_ID from CCM_CORE.ROLE_MEMBERSHIPS"); diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_32__add_domain_ownership_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_32__add_domain_ownership_uuid.java index 413fc8ba3..a80ec0749 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_32__add_domain_ownership_uuid.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_32__add_domain_ownership_uuid.java @@ -18,7 +18,8 @@ */ 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.PreparedStatement; @@ -29,12 +30,14 @@ import java.util.UUID; * * @author Jens Pelzetter */ -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 - 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 .prepareStatement("select OWNERSHIP_ID from CCM_CORE.DOMAIN_OWNERSHIPS"); diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_33__add_categorization_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_33__add_categorization_uuid.java index 388d29a91..8a6dae70f 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_33__add_categorization_uuid.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_33__add_categorization_uuid.java @@ -18,7 +18,8 @@ */ 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.PreparedStatement; @@ -29,11 +30,13 @@ import java.util.UUID; * * @author Jens Pelzetter */ -public class V7_0_0_33__add_categorization_uuid implements JdbcMigration { +public class V7_0_0_33__add_categorization_uuid extends BaseJavaMigration { @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 .prepareStatement("select CATEGORIZATION_ID " + "from CCM_CORE.CATEGORIZATIONS"); diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_34__add_resourcetype_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_34__add_resourcetype_uuid.java index 583bb1d81..c2d6e02bd 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_34__add_resourcetype_uuid.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_34__add_resourcetype_uuid.java @@ -18,7 +18,8 @@ */ 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.PreparedStatement; @@ -29,11 +30,13 @@ import java.util.UUID; * * @author Jens Pelzetter */ -public class V7_0_0_34__add_resourcetype_uuid implements JdbcMigration { +public class V7_0_0_34__add_resourcetype_uuid extends BaseJavaMigration { @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 .prepareStatement("select RESOURCE_TYPE_ID " + "from CCM_CORE.RESOURCE_TYPES"); diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_35__add_task_assignment_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_35__add_task_assignment_uuid.java index af24aab2d..c6265677d 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_35__add_task_assignment_uuid.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_35__add_task_assignment_uuid.java @@ -18,7 +18,8 @@ */ 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.PreparedStatement; @@ -29,12 +30,13 @@ import java.util.UUID; * * @author Jens Pelzetter */ -public class V7_0_0_35__add_task_assignment_uuid - implements JdbcMigration { +public class V7_0_0_35__add_task_assignment_uuid extends BaseJavaMigration { @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 .prepareStatement("select TASK_ASSIGNMENT_ID " + "from CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS"); diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_36__add_task_dependency_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_36__add_task_dependency_uuid.java index 4cf3c57c7..1df9f8825 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_36__add_task_dependency_uuid.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_36__add_task_dependency_uuid.java @@ -18,7 +18,8 @@ */ 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.PreparedStatement; @@ -29,11 +30,13 @@ import java.util.UUID; * * @author Jens Pelzetter */ -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 - 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 .prepareStatement("select TASK_DEPENDENCY_ID " + "from CCM_CORE.WORKFLOW_TASK_DEPENDENCIES"); diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_23__move_components_to_container_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_23__move_components_to_container_h2.java index a7b90ba4f..b791f8e2f 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_23__move_components_to_container_h2.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_23__move_components_to_container_h2.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.h2; import db.migrations.org.libreccm.ccm_core.V7_0_0_23__move_components_to_container; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_23__move_components_to_container_h2 - extends V7_0_0_23__move_components_to_container - implements JdbcMigration { + extends V7_0_0_23__move_components_to_container { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_27__add_party_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_27__add_party_uuid_h2.java index beb2cce0c..533ac6813 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_27__add_party_uuid_h2.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_27__add_party_uuid_h2.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.h2; 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 Jens Pelzetter */ public class V7_0_0_27__add_party_uuid_h2 - extends V7_0_0_27__add_party_uuid - implements JdbcMigration { + extends V7_0_0_27__add_party_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_28__add_role_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_28__add_role_uuid_h2.java index ac84a15c4..dfa512800 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_28__add_role_uuid_h2.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_28__add_role_uuid_h2.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.h2; import db.migrations.org.libreccm.ccm_core.V7_0_0_28__add_role_uuid; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_28__add_role_uuid_h2 - extends V7_0_0_28__add_role_uuid - implements JdbcMigration { + extends V7_0_0_28__add_role_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_29__add_permission_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_29__add_permission_uuid_h2.java index 4401ed950..4ae20dffe 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_29__add_permission_uuid_h2.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_29__add_permission_uuid_h2.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.h2; import db.migrations.org.libreccm.ccm_core.V7_0_0_29__add_permission_uuid; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_29__add_permission_uuid_h2 - extends V7_0_0_29__add_permission_uuid - implements JdbcMigration { + extends V7_0_0_29__add_permission_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_30__add_groupmembership_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_30__add_groupmembership_uuid_h2.java index 154de88ee..1b4a1b7f5 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_30__add_groupmembership_uuid_h2.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_30__add_groupmembership_uuid_h2.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.h2; import db.migrations.org.libreccm.ccm_core.V7_0_0_30__add_groupmembership_uuid; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_30__add_groupmembership_uuid_h2 - extends V7_0_0_30__add_groupmembership_uuid - implements JdbcMigration { + extends V7_0_0_30__add_groupmembership_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_31__add_rolemembership_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_31__add_rolemembership_uuid_h2.java index dfdaa218f..7db2d13de 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_31__add_rolemembership_uuid_h2.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_31__add_rolemembership_uuid_h2.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.h2; import db.migrations.org.libreccm.ccm_core.V7_0_0_31__add_rolemembership_uuid; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_31__add_rolemembership_uuid_h2 - extends V7_0_0_31__add_rolemembership_uuid - implements JdbcMigration { + extends V7_0_0_31__add_rolemembership_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_32__add_domain_ownership_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_32__add_domain_ownership_uuid_h2.java index 5d998a05b..86c61b68a 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_32__add_domain_ownership_uuid_h2.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_32__add_domain_ownership_uuid_h2.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.h2; import db.migrations.org.libreccm.ccm_core.V7_0_0_32__add_domain_ownership_uuid; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_32__add_domain_ownership_uuid_h2 - extends V7_0_0_32__add_domain_ownership_uuid - implements JdbcMigration { + extends V7_0_0_32__add_domain_ownership_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_33__add_categorization_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_33__add_categorization_uuid_h2.java index 07d2afa6b..d0826965b 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_33__add_categorization_uuid_h2.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_33__add_categorization_uuid_h2.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.h2; import db.migrations.org.libreccm.ccm_core.V7_0_0_33__add_categorization_uuid; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_33__add_categorization_uuid_h2 - extends V7_0_0_33__add_categorization_uuid - implements JdbcMigration { + extends V7_0_0_33__add_categorization_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_34__add_resourcetype_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_34__add_resourcetype_uuid_h2.java index a3235be20..d5ae6e452 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_34__add_resourcetype_uuid_h2.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_34__add_resourcetype_uuid_h2.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.h2; import db.migrations.org.libreccm.ccm_core.V7_0_0_34__add_resourcetype_uuid; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_34__add_resourcetype_uuid_h2 - extends V7_0_0_34__add_resourcetype_uuid - implements JdbcMigration { + extends V7_0_0_34__add_resourcetype_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_35__add_task_assignment_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_35__add_task_assignment_uuid_h2.java index 722f54544..df8bb8fc6 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_35__add_task_assignment_uuid_h2.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_35__add_task_assignment_uuid_h2.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.h2; import db.migrations.org.libreccm.ccm_core.V7_0_0_35__add_task_assignment_uuid; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_35__add_task_assignment_uuid_h2 - extends V7_0_0_35__add_task_assignment_uuid - implements JdbcMigration { + extends V7_0_0_35__add_task_assignment_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_36__add_task_dependency_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_36__add_task_dependency_uuid_h2.java index 84a728da2..8445c9e04 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_36__add_task_dependency_uuid_h2.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_36__add_task_dependency_uuid_h2.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.h2; import db.migrations.org.libreccm.ccm_core.V7_0_0_36__add_task_dependency_uuid; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_36__add_task_dependency_uuid_h2 - extends V7_0_0_36__add_task_dependency_uuid - implements JdbcMigration { + extends V7_0_0_36__add_task_dependency_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_23__move_components_to_container_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_23__move_components_to_container_pgsql.java index 4daa36bd5..485bbce0d 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_23__move_components_to_container_pgsql.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_23__move_components_to_container_pgsql.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.pgsql; import db.migrations.org.libreccm.ccm_core.V7_0_0_23__move_components_to_container; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_23__move_components_to_container_pgsql - extends V7_0_0_23__move_components_to_container - implements JdbcMigration { + extends V7_0_0_23__move_components_to_container { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_27__add_party_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_27__add_party_uuid_pgsql.java index 652e99957..fdaca9458 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_27__add_party_uuid_pgsql.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_27__add_party_uuid_pgsql.java @@ -19,21 +19,19 @@ package db.migrations.org.libreccm.ccm_core.pgsql; 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 Jens Pelzetter */ public class V7_0_0_27__add_party_uuid_pgsql - extends V7_0_0_27__add_party_uuid - implements JdbcMigration { + extends V7_0_0_27__add_party_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_28__add_role_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_28__add_role_uuid_pgsql.java index 1cd1cfe71..1ca5700ad 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_28__add_role_uuid_pgsql.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_28__add_role_uuid_pgsql.java @@ -18,23 +18,20 @@ */ 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 org.flywaydb.core.api.migration.jdbc.JdbcMigration; +import org.flywaydb.core.api.migration.Context; -import java.sql.Connection; /** * * @author Jens Pelzetter */ public class V7_0_0_28__add_role_uuid_pgsql - extends V7_0_0_28__add_role_uuid - implements JdbcMigration { + extends V7_0_0_28__add_role_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_29__add_permission_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_29__add_permission_uuid_pgsql.java index 816f3791b..788662fd1 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_29__add_permission_uuid_pgsql.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_29__add_permission_uuid_pgsql.java @@ -18,23 +18,19 @@ */ 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 org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_29__add_permission_uuid_pgsql - extends V7_0_0_29__add_permission_uuid - implements JdbcMigration { + extends V7_0_0_29__add_permission_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_30__add_groupmembership_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_30__add_groupmembership_uuid_pgsql.java index bf68c6a35..5c99294dc 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_30__add_groupmembership_uuid_pgsql.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_30__add_groupmembership_uuid_pgsql.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.pgsql; import db.migrations.org.libreccm.ccm_core.V7_0_0_30__add_groupmembership_uuid; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_30__add_groupmembership_uuid_pgsql - extends V7_0_0_30__add_groupmembership_uuid - implements JdbcMigration { + extends V7_0_0_30__add_groupmembership_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_31__add_rolemembership_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_31__add_rolemembership_uuid_pgsql.java index 8e858d201..f3b96332c 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_31__add_rolemembership_uuid_pgsql.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_31__add_rolemembership_uuid_pgsql.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.pgsql; import db.migrations.org.libreccm.ccm_core.V7_0_0_31__add_rolemembership_uuid; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_31__add_rolemembership_uuid_pgsql - extends V7_0_0_31__add_rolemembership_uuid - implements JdbcMigration { + extends V7_0_0_31__add_rolemembership_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_32__add_domain_ownership_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_32__add_domain_ownership_uuid_pgsql.java index fd9f3310a..e1fa412b8 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_32__add_domain_ownership_uuid_pgsql.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_32__add_domain_ownership_uuid_pgsql.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.pgsql; import db.migrations.org.libreccm.ccm_core.V7_0_0_32__add_domain_ownership_uuid; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_32__add_domain_ownership_uuid_pgsql - extends V7_0_0_32__add_domain_ownership_uuid - implements JdbcMigration { + extends V7_0_0_32__add_domain_ownership_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_33__add_categorization_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_33__add_categorization_uuid_pgsql.java index 267acb4e5..b5026859c 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_33__add_categorization_uuid_pgsql.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_33__add_categorization_uuid_pgsql.java @@ -18,23 +18,19 @@ */ 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 org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_33__add_categorization_uuid_pgsql - extends V7_0_0_33__add_categorization_uuid - implements JdbcMigration { + extends V7_0_0_33__add_categorization_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_34__add_resourcetype_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_34__add_resourcetype_uuid_pgsql.java index f9984400c..f618f20d8 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_34__add_resourcetype_uuid_pgsql.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_34__add_resourcetype_uuid_pgsql.java @@ -18,23 +18,19 @@ */ 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 org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_34__add_resourcetype_uuid_pgsql - extends V7_0_0_34__add_resourcetype_uuid - implements JdbcMigration { + extends V7_0_0_34__add_resourcetype_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_35__add_task_assignment_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_35__add_task_assignment_uuid_pgsql.java index 5709d49e2..6e6ec5b21 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_35__add_task_assignment_uuid_pgsql.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_35__add_task_assignment_uuid_pgsql.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.pgsql; import db.migrations.org.libreccm.ccm_core.V7_0_0_35__add_task_assignment_uuid; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_35__add_task_assignment_uuid_pgsql - extends V7_0_0_35__add_task_assignment_uuid - implements JdbcMigration { + extends V7_0_0_35__add_task_assignment_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_36__add_task_dependency_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_36__add_task_dependency_uuid_pgsql.java index 989516115..f9fb72e9a 100644 --- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_36__add_task_dependency_uuid_pgsql.java +++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_36__add_task_dependency_uuid_pgsql.java @@ -19,21 +19,18 @@ package db.migrations.org.libreccm.ccm_core.pgsql; import db.migrations.org.libreccm.ccm_core.V7_0_0_36__add_task_dependency_uuid; -import org.flywaydb.core.api.migration.jdbc.JdbcMigration; - -import java.sql.Connection; +import org.flywaydb.core.api.migration.Context; /** * * @author Jens Pelzetter */ public class V7_0_0_36__add_task_dependency_uuid_pgsql - extends V7_0_0_36__add_task_dependency_uuid - implements JdbcMigration { + extends V7_0_0_36__add_task_dependency_uuid { @Override - public void migrate(final Connection connection) throws Exception { - super.migrate(connection); + public void migrate(final Context context) throws Exception { + super.migrate(context); } } diff --git a/ccm-core/src/main/java/org/libreccm/core/api/JsonArrayCollector.java b/ccm-core/src/main/java/org/libreccm/core/api/JsonArrayCollector.java index 94a9730a6..a3aba14a5 100644 --- a/ccm-core/src/main/java/org/libreccm/core/api/JsonArrayCollector.java +++ b/ccm-core/src/main/java/org/libreccm/core/api/JsonArrayCollector.java @@ -18,7 +18,6 @@ */ package org.libreccm.core.api; -import com.google.common.collect.Sets; import java.util.Collections; import java.util.Set; diff --git a/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java index d409fa665..92480a450 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.libreccm.categorization; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.core.CcmObject; @@ -54,8 +54,9 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { - + protected void addPrefabValues( + final SingleTypeEqualsVerifierApi verifier + ) { final Category category1 = new Category(); category1.setName("Category One"); diff --git a/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java index f21d632dc..9b3d52dcc 100644 --- a/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.libreccm.core; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.tests.categories.UnitTest; @@ -54,7 +54,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { final CcmObject ccmObject1 = new CcmObject(); ccmObject1.setObjectId(-100); diff --git a/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java b/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java index 0bea94111..9f8809ef5 100644 --- a/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java @@ -18,7 +18,7 @@ */ package org.libreccm.core; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.categorization.Category; @@ -57,7 +57,7 @@ public class ResourceEntityTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { final Resource resource1 = new Resource(); final LocalizedString title1 = new LocalizedString(); diff --git a/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java index 67f58a389..350578c1f 100644 --- a/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.libreccm.formbuilder; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.categorization.Category; @@ -62,7 +62,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { final Component component1 = new Component(); component1.setAdminName("Component One"); diff --git a/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java index a4a0c74ef..19d43cf35 100644 --- a/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.libreccm.formbuilder.actions; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.formbuilder.Component; @@ -60,7 +60,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { final Component component1 = new Component(); component1.setAdminName("Component One"); diff --git a/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java index cddcc3c58..6c709cda9 100644 --- a/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.libreccm.l10n; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -49,7 +49,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { final Message message1 = new Message(); message1.setSubject("Message One"); diff --git a/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java index 5b4372892..2e4272eea 100644 --- a/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.libreccm.messaging; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.categorization.Category; @@ -54,7 +54,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { final Message message1 = new Message(); message1.setSubject("Message One"); diff --git a/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java index a45ceb2cc..c799c4929 100644 --- a/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.libreccm.notification; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.categorization.Category; @@ -55,7 +55,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { final Message message1 = new Message(); message1.setSubject("Message One"); diff --git a/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java index 9a502a2fd..f538c008f 100644 --- a/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.libreccm.portal; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.categorization.Category; @@ -53,7 +53,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { final Portal portal1 = new Portal(); portal1.setDisplayName("Portal One"); diff --git a/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java index a218401bb..dfb1ce0ce 100644 --- a/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.libreccm.runtime; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.tests.categories.UnitTest; @@ -47,7 +47,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { final Initalizer initalizer1 = new Initalizer(); initalizer1.setClassName("org.example.foo.Initalizer"); diff --git a/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java index c2d304b33..bd2dc37d1 100644 --- a/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.libreccm.search.lucene; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.security.Group; @@ -50,7 +50,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { final Document document1 = new Document(); document1.setTitle("document1"); diff --git a/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java index 4ae48e8e8..e9fdb8543 100644 --- a/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.libreccm.security; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.core.CcmObject; @@ -56,7 +56,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { final Group group1 = new Group(); group1.setName("group1"); diff --git a/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java index 7b6046bf9..74b04eac1 100644 --- a/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.libreccm.theming.db; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.tests.categories.UnitTest; @@ -51,7 +51,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { Objects.requireNonNull(verifier); diff --git a/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java index 1d44c93ef..abe3727bb 100644 --- a/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.libreccm.web; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.libreccm.categorization.Category; @@ -55,7 +55,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { final Resource resource1 = new Resource(); resource1.setDisplayName("Resource One"); diff --git a/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java index 4c47c2a57..36124b50b 100644 --- a/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java +++ b/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java @@ -18,7 +18,7 @@ */ package org.libreccm.workflow; -import nl.jqno.equalsverifier.EqualsVerifierApi; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -57,7 +57,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier { } @Override - protected void addPrefabValues(final EqualsVerifierApi verifier) { + protected void addPrefabValues(final SingleTypeEqualsVerifierApi verifier) { super.addPrefabValues(verifier); diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml index 9be30402a..92859132a 100644 --- a/ccm-docrepo/pom.xml +++ b/ccm-docrepo/pom.xml @@ -49,7 +49,7 @@ - org.hibernate + org.hibernate.validator hibernate-validator provided @@ -266,12 +266,10 @@ org.apache.maven.plugins maven-project-info-reports-plugin - diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml index 2b41dd67f..bba0e1aa1 100644 --- a/ccm-shortcuts/pom.xml +++ b/ccm-shortcuts/pom.xml @@ -57,7 +57,7 @@ - org.hibernate + org.hibernate.validator hibernate-validator provided @@ -307,7 +307,6 @@ org.apache.maven.plugins diff --git a/ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java b/ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java index 031d1ef45..d20b99f08 100644 --- a/ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java +++ b/ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java @@ -18,8 +18,8 @@ */ package org.libreccm.testutils; -import nl.jqno.equalsverifier.EqualsVerifierApi; import nl.jqno.equalsverifier.Warning; +import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi; import org.junit.Test; import org.junit.runners.Parameterized; @@ -89,7 +89,9 @@ public class EqualsVerifier { * * @param verifier The verifier to which the suppression are added. */ - protected void addSuppressWarnings(final EqualsVerifierApi verifier) { + protected void addSuppressWarnings( + final SingleTypeEqualsVerifierApi verifier + ) { verifier .suppress(Warning.STRICT_INHERITANCE) @@ -102,14 +104,14 @@ public class EqualsVerifier { * * @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 } @Test public void verifyEqualsAndHashCode() { - final EqualsVerifierApi verifier + final SingleTypeEqualsVerifierApi verifier = nl.jqno.equalsverifier.EqualsVerifier .forClass(entityClass) .withRedefinedSuperclass(); diff --git a/pom.xml b/pom.xml index 5962be573..3b938b54f 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.1.1 + 3.3.0 org.apache.maven.plugins @@ -163,7 +163,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.8.1 1.8 1.8 @@ -180,27 +180,27 @@ org.apache.maven.plugins maven-ear-plugin - 3.0.1 + 3.0.2 org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M2 + 3.0.0-M3 org.apache.maven.plugins maven-jar-plugin - 3.1.1 + 3.2.0 org.apache.maven.plugins maven-javadoc-plugin - 3.1.0 + 3.2.0 org.apache.maven.plugins maven-pmd-plugin - 3.11.0 + 3.13.0 true utf-8 @@ -236,17 +236,17 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.0 org.apache.maven.plugins maven-release-plugin - 2.5.3 + 3.0.0-M1 org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M3 + 3.0.0-M4 org.apache.maven.plugins @@ -256,7 +256,7 @@ org.apache.maven.plugins maven-war-plugin - 3.2.2 + 3.3.0 - org.hibernate + org.hibernate.validator hibernate-validator - 6.0.18.Final + 6.1.5.Final - org.hibernate + org.hibernate.validator hibernate-validator-cdi - 6.0.18.Final + 6.1.5.Final + javax.el javax.el-api @@ -477,7 +477,7 @@ org.hibernate hibernate-search-orm - 5.10.7.Final + 5.11.5.Final io.jsonwebtoken jjwt-api - 0.10.6 + 0.11.2 io.jsonwebtoken jjwt-impl - 0.10.6 + 0.11.2 io.jsonwebtoken jjwt-jackson - 0.10.6 + 0.11.2 + + - org.codehaus.woodstox - woodstox-core-asl - 4.4.1 + org.postgresql + postgresql + 42.2.14 org.jacoco org.jacoco.core - 0.8.3 + 0.8.5 test @@ -798,12 +839,12 @@ org.hamcrest hamcrest-core - 2.1 + 2.2 org.hamcrest hamcrest-library - 2.1 + 2.2 test @@ -815,15 +856,14 @@ nl.jqno.equalsverifier equalsverifier - - 3.1.9 + 3.4 com.h2database h2 - 1.4.199 + 1.4.200