Upgraded all libraries, switched to npm, upgraded angular and jdk21
Locusworks Team/portal-webapp/pipeline/head There was a failure building this commit
Locusworks Team/portal-webapp/pipeline/head There was a failure building this commit
This commit is contained in:
1 parent
c2f8e20fad
commit
a6df549919
335 files changed
+10923
-12700
No files matched your search
+3
-3
@@ -6,8 +6,8 @@ import org.flywaydb.core.Flyway;
|
||||
import org.flywaydb.core.api.MigrationInfo;
|
||||
import org.flywaydb.core.internal.info.MigrationInfoDumper;
|
||||
|
||||
import net.locusworks.common.logger.ApplicationLogger;
|
||||
import net.locusworks.common.logger.ApplicationLoggerFactory;
|
||||
import net.locusworks.logger.ApplicationLogger;
|
||||
import net.locusworks.logger.ApplicationLoggerFactory;
|
||||
|
||||
/**
|
||||
* Migration item class to help with flyway migrations
|
||||
@@ -39,7 +39,7 @@ public class MigrationItem {
|
||||
* @return array of schemas
|
||||
*/
|
||||
public String[] getSchemas() {
|
||||
return flyway.getSchemas();
|
||||
return flyway.getConfiguration().getSchemas();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+14
-11
@@ -1,15 +1,17 @@
|
||||
package net.locusworks.portal.migration.util;
|
||||
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
import java.util.List;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
|
||||
import jakarta.annotation.PostConstruct;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import net.locusworks.common.logger.ApplicationLogger;
|
||||
import net.locusworks.common.logger.ApplicationLoggerFactory;
|
||||
import net.locusworks.logger.ApplicationLogger;
|
||||
import net.locusworks.logger.ApplicationLoggerFactory;
|
||||
import net.locusworks.common.utils.Utils;
|
||||
import net.locusworks.portal.common.PortalDataSource;
|
||||
import net.locusworks.portal.database.migration.PortalMigration;
|
||||
@@ -20,8 +22,8 @@ import net.locusworks.portal.database.migration.PortalMigration;
|
||||
* @since 1.0.0-RELEASE
|
||||
* @version 1.0
|
||||
*/
|
||||
@Component
|
||||
public class MigrationManager {
|
||||
@Component("migration")
|
||||
public class MigrationManager {
|
||||
|
||||
@Autowired
|
||||
private PortalDataSource portalDatasource;
|
||||
@@ -32,10 +34,11 @@ public class MigrationManager {
|
||||
|
||||
public MigrationManager() { }
|
||||
|
||||
/**
|
||||
* Perform the migrations
|
||||
*/
|
||||
public void migrate() {
|
||||
/**
|
||||
* Perform the migrations
|
||||
*/
|
||||
@PostConstruct
|
||||
public void migrate() {
|
||||
logger.info("Performing database migrations");
|
||||
|
||||
DataSource ds = portalDatasource.getPortalRootDataSource();
|
||||
|
||||
Reference in new issue
Block a user