diff options
Diffstat (limited to 'epsdk-app-onap')
3 files changed, 20 insertions, 13 deletions
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml index e6f8b3767..db123b44b 100755 --- a/epsdk-app-onap/pom.xml +++ b/epsdk-app-onap/pom.xml @@ -25,8 +25,8 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <epsdk.version>2.5.0</epsdk.version> - <jackson.version>2.9.8</jackson.version> - <springframework.version>5.1.6.RELEASE</springframework.version> + <jackson.version>2.9.9</jackson.version> + <springframework.version>5.1.9.RELEASE</springframework.version> <!-- epsdk-core is importing this class, which is only on spring-orm 4 but not in orm 5: org.springframework.orm.hibernate4.HibernateTransactionManager so following orm.version lets epsdk-core find it --> @@ -370,7 +370,7 @@ <dependency> <groupId>io.searchbox</groupId> <artifactId>jest</artifactId> - <version>2.0.0</version> + <version>6.3.1</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -381,7 +381,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> + <version>4.0.1</version> </dependency> <dependency> <groupId>junit</groupId> @@ -391,17 +391,17 @@ <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>20160212</version> + <version>20190722</version> </dependency> <dependency> <groupId>org.liquibase</groupId> <artifactId>liquibase-core</artifactId> - <version>3.5.5</version> + <version>3.7.0</version> </dependency> <dependency> <groupId>org.quartz-scheduler</groupId> <artifactId>quartz</artifactId> - <version>2.2.1</version> + <version>2.3.1</version> <exclusions> <!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 --> <exclusion> @@ -414,7 +414,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - <version>1.7.12</version> + <version>1.7.27</version> </dependency> <!-- springframework to override epsdk-app-common's and epsdk-core's versions --> @@ -468,7 +468,7 @@ <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> - <version>2.2.3</version> + <version>2.3.1</version> </dependency> </dependencies> diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java index 7c1b5c693..ca317dde2 100644 --- a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java @@ -37,11 +37,12 @@ */ package org.onap.portalapp.conf; +import java.util.TimeZone; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; import org.onap.portalsdk.core.conf.AppInitializer; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; -import java.util.TimeZone; - public class ExternalAppInitializer extends AppInitializer { private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(ExternalAppInitializer.class); @@ -54,6 +55,12 @@ public class ExternalAppInitializer extends AppInitializer { return new Class[] { appConfigClass }; } + @Override + public void onStartup(ServletContext servletContext) throws ServletException { + super.onStartup(servletContext); + setDefaultTimeZoneToUTC(); + } + //set time zone to UTC so Dates would be written to DB in UTC timezone private void setDefaultTimeZoneToUTC() { System.setProperty("user.timezone", "UTC"); diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java index 9f8f7279a..02fbfa96d 100644 --- a/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java +++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java @@ -3,6 +3,7 @@ * ONAP Portal SDK * =================================================================== * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019 IBM. * =================================================================== * * Unless otherwise specified, all software contained herein is licensed @@ -74,8 +75,7 @@ public class RegistryAdapter { public List<Trigger> addCoreTriggers() { // On startup of the application after crash recovery, invoke workflow // schedule trigger - List<Trigger> triggers = getWorkflowScheduleService().triggerWorkflowScheduling(); - return triggers; + return getWorkflowScheduleService().triggerWorkflowScheduling(); } public void setSchedulerBean(final SchedulerFactoryBean schedulerBean) { |