Merge branch 'master' into replace-ccmsh-with-wildfly-maven-plugin

Former-commit-id: 1f0e93fcd2
pull/4/head
Jens Pelzetter 2020-07-18 10:01:34 +02:00
commit da21cfb5c1
75 changed files with 350 additions and 470 deletions

View File

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

View File

@ -228,11 +228,6 @@
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.5.201505241946</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View File

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

View File

@ -257,7 +257,6 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>

View File

@ -236,11 +236,6 @@
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.5.201505241946</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View File

@ -64,12 +64,12 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope>
</dependency>
@ -255,10 +255,6 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View File

@ -64,12 +64,12 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope>
</dependency>
@ -252,11 +252,7 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>

View File

@ -64,12 +64,12 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope>
</dependency>
@ -251,10 +251,6 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View File

@ -64,12 +64,12 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope>
</dependency>
@ -252,10 +252,6 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View File

@ -64,12 +64,12 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope>
</dependency>
@ -251,10 +251,6 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View File

@ -64,12 +64,12 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope>
</dependency>
@ -251,10 +251,6 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View File

@ -64,12 +64,12 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope>
</dependency>
@ -251,11 +251,7 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>

View File

@ -64,12 +64,12 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope>
</dependency>
@ -252,10 +252,6 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View File

@ -55,12 +55,12 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope>
</dependency>
@ -294,16 +294,9 @@
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<!--<configuration>
<excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
</configuration>-->
</plugin>
<plugin>

View File

@ -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()

View File

@ -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");

View File

@ -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");

View File

@ -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);

View File

@ -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) {
}
}

View File

@ -49,12 +49,12 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId>
<scope>provided</scope>
</dependency>
@ -215,7 +215,6 @@
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<!--<version>0.9.11</version>-->
</dependency>
<!--<dependency>
@ -255,10 +254,6 @@
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
</dependency>
<dependency> <!-- better xml library -->
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
</dependency>
<dependency> <!-- for csv ex-/import -->
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-csv</artifactId>
@ -422,19 +417,12 @@
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
<excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
</configuration>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<configuration>
<excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
<excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
</configuration>
</plugin>
@ -587,13 +575,11 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-embedded</artifactId>
<version>1.7.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-embedded</artifactId>
<version>1.7.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
@ -625,19 +611,16 @@
<dependency>
<groupId>org.jboss.logmanager</groupId>
<artifactId>jboss-logmanager</artifactId>
<version>2.0.3.Final</version>
<scope>test</scope>
</dependency>
<!--Required for WebServices and RESTful WebServices-->
<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.3</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
@ -717,12 +700,10 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
<version>1.7.3</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
<version>1.7.3</version>
<classifier>plus</classifier>
<type>zip</type>
</dependency>

View File

@ -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 <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
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");

View File

@ -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 <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
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();

View File

@ -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 <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
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");

View File

@ -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 <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
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");

View File

@ -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 <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
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");

View File

@ -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 <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
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");

View File

@ -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 <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
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");

View File

@ -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 <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
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");

View File

@ -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 <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
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");

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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");

View File

@ -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 <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
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");

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

@ -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 <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
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);
}
}

View File

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

View File

@ -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");

View File

@ -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);

View File

@ -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();

View File

@ -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");

View File

@ -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");

View File

@ -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");

View File

@ -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");

View File

@ -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");

View File

@ -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");

View File

@ -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");

View File

@ -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");

View File

@ -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");

View File

@ -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);

View File

@ -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");

View File

@ -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);

View File

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

View File

@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
</dependency>
@ -291,16 +291,9 @@
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<!--<configuration>
<excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
</configuration>-->
</plugin>
<plugin>
@ -334,7 +327,6 @@
<!--<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javancss-maven-plugin</artifactId>
<version>2.1</version>
</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View File

@ -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();

View File

@ -157,13 +157,6 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<!--<configuration>
<excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
</configuration>-->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>

170
pom.xml
View File

@ -152,7 +152,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version>
<version>3.3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -162,7 +162,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@ -179,27 +179,27 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
<version>3.0.0-M3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.11.0</version>
<version>3.13.0</version>
<configuration>
<linkXref>true</linkXref>
<sourceEncoding>utf-8</sourceEncoding>
@ -235,12 +235,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<version>3.0.0-M1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -250,7 +250,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M3</version>
<version>3.0.0-M4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -265,7 +265,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.2.2</version>
<version>3.3.0</version>
</plugin>
<!--
@ -274,17 +274,17 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.7.6</version>
<version>1.10.0</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>3.1.11</version>
<version>4.0.0</version>
<configuration>
<findbugsXmlOutput>true</findbugsXmlOutput>
<xmlOutput>true</xmlOutput>
@ -306,29 +306,12 @@
<plugin>
<groupId>io.thorntail</groupId>
<artifactId>thorntail-maven-plugin</artifactId>
<version>2.4.0.Final</version>
<version>2.7.0.Final</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.5</version>
<configuration>
<findbugsXmlOutput>true</findbugsXmlOutput>
<xmlOutput>true</xmlOutput>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>findbugs</goal>
</goals>
</execution>
</executions>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@ -343,7 +326,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.3</version>
<version>0.8.5</version>
</plugin>
<plugin>
<groupId>org.wildfly.plugins</groupId>
@ -360,7 +343,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<excludeDefaultDirectories>true</excludeDefaultDirectories>
<filesets>
@ -453,7 +435,7 @@
<dependency>
<groupId>io.thorntail</groupId>
<artifactId>bom</artifactId>
<version>2.4.0.Final</version>
<version>2.7.0.Final</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@ -467,7 +449,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.3.15.Final</version>
<version>5.3.17.Final</version>
</dependency>
<!--
@ -477,7 +459,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId>
<version>5.3.15.Final</version>
<version>5.3.17.Final</version>
</dependency>
<dependency>
@ -490,15 +472,16 @@
Hibernate Validator used as implemenation of the Bean
Validation API -->
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>6.0.18.Final</version>
<version>6.1.5.Final</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator-cdi</artifactId>
<version>6.0.18.Final</version>
<version>6.1.5.Final</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
@ -517,7 +500,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search-orm</artifactId>
<version>5.10.7.Final</version>
<version>5.11.5.Final</version>
</dependency>
<!--
@ -526,7 +509,7 @@
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
<version>5.2.4</version>
<version>6.4.4</version>
</dependency>
<!--
@ -548,29 +531,29 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<version>1.4.0</version>
<version>1.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
<version>1.4.0</version>
<version>1.5.3</version>
</dependency>
<!-- Json Web Token support -->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId>
<version>0.10.6</version>
<version>0.11.2</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId>
<version>0.10.6</version>
<version>0.11.2</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
<version>0.10.6</version>
<version>0.11.2</version>
</dependency>
<!--
@ -590,7 +573,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
<version>2.11.2</version>
<version>2.13.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -602,13 +585,13 @@
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<version>8.0.0</version>
<version>8.5.2</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>2.0.15</version>
<version>2.0.20</version>
</dependency>
@ -616,7 +599,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.3</version>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@ -626,7 +609,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.12</version>
<version>1.14</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@ -646,7 +629,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
<version>2.7</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@ -674,19 +657,19 @@
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.9.11</version>
<version>0.9.12</version>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.28</version>
<version>2.3.30</version>
</dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>9.9.1-2</version>
<version>10.1</version>
</dependency>
<dependency>
@ -704,13 +687,13 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.11.3</version>
<version>1.13.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>3.6.1</version>
<version>3.6.3</version>
</dependency>
<dependency>
@ -758,18 +741,11 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.9.8</version>
<version>2.11.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<!-- better xml library -->
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
<version>4.4.1</version>
</dependency>
<!--
**********************
Dependencies for tests
@ -779,7 +755,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13</version>
</dependency>
<!--
@ -789,7 +765,7 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
<version>1.4.1.Final</version>
<version>1.6.0.Final</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@ -806,7 +782,7 @@
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-jacoco</artifactId>
<version>1.0.0.Alpha10</version>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.wildfly.arquillian</groupId>
@ -821,13 +797,54 @@
<scope>test</scope>
</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
-->
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.core</artifactId>
<version>0.8.3</version>
<version>0.8.5</version>
<scope>test</scope>
</dependency>
@ -838,12 +855,12 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>2.1</version>
<version>2.2</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>2.1</version>
<version>2.2</version>
<scope>test</scope>
</dependency>
@ -855,15 +872,14 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<!--<version>1.7.8</version>-->
<version>3.1.9</version>
<version>3.4</version>
</dependency>
<!-- h2 database in used to check some database related things -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.4.199</version>
<version>1.4.200</version>
</dependency>
<!-- WebJars -->