From c3bf752a573a6292d45b4f1cbc6e5dacaac3fe1b Mon Sep 17 00:00:00 2001 From: Isaac Parenteau Date: Sat, 7 Jul 2018 22:31:51 -0500 Subject: [PATCH] updated java depenencies --- .gitignore | 2 +- pom.xml | 10 +++++----- portal_common/pom.xml | 4 ++-- .../locusworks/portal/common/PortalDataSource.java | 2 +- portal_database/pom.xml | 7 ------- portal_migration/pom.xml | 2 +- .../portal/migration/util/MigrationItem.java | 14 ++++++++++++++ .../portal/migration/util/MigrationManager.java | 5 ++++- portal_webapp/pom.xml | 2 +- .../WebsocketOutboundChannelInterceptor.java | 4 ++-- 10 files changed, 31 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 8484521..c392231 100644 --- a/.gitignore +++ b/.gitignore @@ -32,4 +32,4 @@ tags **/yarn.lock **/*.blg **/*.log -**/.*.out +**/*.out diff --git a/pom.xml b/pom.xml index 62efc45..c2fa681 100644 --- a/pom.xml +++ b/pom.xml @@ -22,12 +22,12 @@ 1.8 - 5.0.5.RELEASE - 5.0.4.RELEASE + 5.0.7.RELEASE + 5.0.6.RELEASE ${project.basedir} 5.2.16.Final - 5.0.7 - 2.6.0 + 5.1.4 + 2.6.1 1.0.0-RELEASE 1.7.25 3.0.5 @@ -295,7 +295,7 @@ org.springframework.data spring-data-jpa - 2.0.6.RELEASE + 2.0.8.RELEASE diff --git a/portal_common/pom.xml b/portal_common/pom.xml index daf2174..c366aa8 100644 --- a/portal_common/pom.xml +++ b/portal_common/pom.xml @@ -57,12 +57,12 @@ org.apache.commons commons-dbcp2 - 2.2.0 + 2.4.0 org.apache.commons commons-pool2 - 2.5.0 + 2.6.0 diff --git a/portal_common/src/main/java/net/locusworks/portal/common/PortalDataSource.java b/portal_common/src/main/java/net/locusworks/portal/common/PortalDataSource.java index de089b8..50f53f3 100644 --- a/portal_common/src/main/java/net/locusworks/portal/common/PortalDataSource.java +++ b/portal_common/src/main/java/net/locusworks/portal/common/PortalDataSource.java @@ -110,7 +110,7 @@ public class PortalDataSource { pcf.setValidationQuery("SELECT 1"); pcf.setDefaultAutoCommit(true); - GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig(); + GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig<>(); poolConfig.setMinIdle(10); poolConfig.setMaxTotal(100); diff --git a/portal_database/pom.xml b/portal_database/pom.xml index 0c110ef..8d84a89 100644 --- a/portal_database/pom.xml +++ b/portal_database/pom.xml @@ -91,13 +91,6 @@ - - - com.google.protobuf - protobuf-java - 3.5.1 - - org.hibernate hibernate-core diff --git a/portal_migration/pom.xml b/portal_migration/pom.xml index bbfadc5..00f4438 100644 --- a/portal_migration/pom.xml +++ b/portal_migration/pom.xml @@ -14,7 +14,7 @@ ${project.parent.basedir} - com.mysql.jdbc.Driver + com.mysql.cj.jdbc.Driver diff --git a/portal_migration/src/main/java/net/locusworks/portal/migration/util/MigrationItem.java b/portal_migration/src/main/java/net/locusworks/portal/migration/util/MigrationItem.java index 8211e9b..170ff45 100644 --- a/portal_migration/src/main/java/net/locusworks/portal/migration/util/MigrationItem.java +++ b/portal_migration/src/main/java/net/locusworks/portal/migration/util/MigrationItem.java @@ -49,6 +49,20 @@ public class MigrationItem { public int qtyPending() { return pendingMigrations.length; } + + public void repair() { + //Perform a repair just in case an upgrade before 5.0 happens + try { + //TODO find a better way to perform repair if previous version was before 5.0 + String schemas = Arrays.toString(getSchemas()).replace("[", "").replace("]", ""); + logger.info(String.format("Repair status for %s:%n%s", schemas, getAllMigrationsLog())); + flyway.repair(); + } catch (Exception e) { + String message = String.format("%nDatabase repair error:%n %s %nPortal webapp cannot continue.", e.getMessage()); + logger.error(message); + throw new RuntimeException(message, e); + } + } /** * Perform the migration diff --git a/portal_migration/src/main/java/net/locusworks/portal/migration/util/MigrationManager.java b/portal_migration/src/main/java/net/locusworks/portal/migration/util/MigrationManager.java index c6ef5d8..2e16785 100644 --- a/portal_migration/src/main/java/net/locusworks/portal/migration/util/MigrationManager.java +++ b/portal_migration/src/main/java/net/locusworks/portal/migration/util/MigrationManager.java @@ -40,7 +40,10 @@ public class MigrationManager { DataSource ds = portalDatasource.getPortalRootDataSource(); migrations = Utils.toList( new MigrationItem(PortalMigration.getFlyway(ds)) ); - migrations.forEach(item -> item.migrate()); + migrations.forEach(item -> { + item.repair(); + item.migrate(); + }); portalDatasource.closeRootDataSource(); } } diff --git a/portal_webapp/pom.xml b/portal_webapp/pom.xml index 716055a..bb98453 100644 --- a/portal_webapp/pom.xml +++ b/portal_webapp/pom.xml @@ -216,7 +216,7 @@ org.eclipse.jgit org.eclipse.jgit - 4.11.0.201803080745-r + 5.0.1.201806211838-r org.slf4j diff --git a/portal_webapp/src/main/java/net/locusworks/portal/websocket/WebsocketOutboundChannelInterceptor.java b/portal_webapp/src/main/java/net/locusworks/portal/websocket/WebsocketOutboundChannelInterceptor.java index c7a34b6..9b202f2 100644 --- a/portal_webapp/src/main/java/net/locusworks/portal/websocket/WebsocketOutboundChannelInterceptor.java +++ b/portal_webapp/src/main/java/net/locusworks/portal/websocket/WebsocketOutboundChannelInterceptor.java @@ -2,7 +2,7 @@ package net.locusworks.portal.websocket; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.support.ChannelInterceptorAdapter; +import org.springframework.messaging.support.ChannelInterceptor; /** * class to handle websocket outbound connections @@ -11,7 +11,7 @@ import org.springframework.messaging.support.ChannelInterceptorAdapter; * @version 1.0 * */ -public class WebsocketOutboundChannelInterceptor extends ChannelInterceptorAdapter { +public class WebsocketOutboundChannelInterceptor implements ChannelInterceptor { @Override public Message preSend(Message message, MessageChannel channel) {