diff options
14 files changed, 69 insertions, 56 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) { @@ -211,7 +211,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>4.12</version> <scope>test</scope> </dependency> @@ -221,9 +221,9 @@ <artifactId>logback-classic</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.2</version> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.4</version> </dependency> <dependency> <groupId>org.apache.poi</groupId> @@ -233,7 +233,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.5.7</version> + <version>4.5.9</version> </dependency> </dependencies> </project> diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml index a1cd41dfd..c0c4958d5 100755 --- a/vid-app-common/pom.xml +++ b/vid-app-common/pom.xml @@ -26,15 +26,16 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <epsdk.version>2.5.0</epsdk.version> - <springframework.version>5.1.6.RELEASE</springframework.version> + <springframework.version>5.1.9.RELEASE</springframework.version> <springframework.orm.version>4.3.22.RELEASE</springframework.orm.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 --> <hibernate.version>4.3.11.Final</hibernate.version> - <jackson.version>2.9.8</jackson.version> - <jersey.version>2.28</jersey.version> + <jackson.version>2.9.9</jackson.version> + <jersey.version>2.29</jersey.version> <surefire.version>2.22.1</surefire.version> + <selenium.version>3.141.59</selenium.version> <sonar.coverage.exclusions>**/webapp/**/*,**/*.js</sonar.coverage.exclusions> <!-- Skip assembling the zip by default --> @@ -495,7 +496,7 @@ <dependency> <groupId>com.opencsv</groupId> <artifactId>opencsv</artifactId> - <version>4.1</version> + <version>4.6</version> </dependency> <!-- HTTP client --> @@ -508,16 +509,17 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> + <version>4.5.9</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpasyncclient</artifactId> - <version>4.0.2</version> + <version>4.1.4</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>4.5.7</version> + <version>4.5.9</version> </dependency> <dependency> <groupId>com.xebialabs.restito</groupId> @@ -528,7 +530,7 @@ <dependency> <groupId>org.jeasy</groupId> <artifactId>easy-random-core</artifactId> - <version>4.0.0.RC1</version> + <version>4.0.0</version> <scope>test</scope> </dependency> @@ -536,7 +538,7 @@ <dependency> <groupId>io.vavr</groupId> <artifactId>vavr</artifactId> - <version>0.9.2</version> + <version>0.10.2</version> </dependency> <!-- SDK overlay war --> @@ -626,7 +628,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> @@ -637,7 +639,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> + <version>4.0.1</version> <scope>provided</scope> </dependency> <dependency> @@ -649,7 +651,7 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.4</version> + <version>2.6</version> <!--<scope>test</scope>--> </dependency> <dependency> @@ -661,12 +663,12 @@ <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>20160212</version> + <version>20190722</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> @@ -679,7 +681,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 --> @@ -763,13 +765,13 @@ <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-java</artifactId> - <version>2.53.1</version> + <version>${selenium.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-api</artifactId> - <version>2.53.1</version> + <version>${selenium.version}</version> <scope>test</scope> </dependency> <dependency> @@ -787,17 +789,17 @@ <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-firefox-driver</artifactId> - <version>2.53.1</version> + <version>${selenium.version}</version> </dependency> <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> - <version>1.4.01</version> + <version>2.0.2</version> </dependency> <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.16</version> + <version>1.24</version> </dependency> <dependency> <groupId>org.skyscreamer</groupId> @@ -808,13 +810,13 @@ <dependency> <groupId>org.onap.sdc.sdc-tosca</groupId> <artifactId>sdc-tosca</artifactId> - <version>1.5.1</version> + <version>1.6.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> <artifactId>json-unit</artifactId> - <version>2.2.0</version> + <version>2.8.0</version> <scope>test</scope> </dependency> <dependency> @@ -831,7 +833,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> - <version>1.1</version> + <version>1.7</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -852,29 +854,30 @@ <dependency> <groupId>org.togglz</groupId> <artifactId>togglz-spring-core</artifactId> - <version>2.5.0.Final</version> + <version>2.6.1.Final</version> </dependency> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.4.196</version> + <version>1.4.199</version> <scope>test</scope> </dependency> <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> - <version>2.2.11</version> + <version>2.3.1</version> </dependency> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>3.10.0</version> + <version>3.13.2</version> <scope>test</scope> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> + <version>28.0-jre</version> </dependency> <dependency> <groupId>io.springfox</groupId> diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java b/vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java index b118901a4..2f69e397c 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java @@ -4,6 +4,7 @@ * ================================================================================ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2018 - 2019 Nokia. All rights reserved. + * Modifications Copyright (C) 2019 IBM. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,13 +36,13 @@ import java.util.UUID; import static org.onap.vid.utils.Logging.REQUEST_ID_HEADER_KEY; public class PombaRestInterface extends AAIRestInterface { + + private Client client = null; public PombaRestInterface (HttpsAuthClient httpsAuthClientFactory, ServletRequestHelper servletRequestHelper, SystemPropertyHelper systemPropertyHelper) { super(httpsAuthClientFactory, servletRequestHelper, systemPropertyHelper); } - private Client client = null; - @Override protected void initRestClient() { diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.java b/vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.java index d03362ba8..af665f849 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.java @@ -3,6 +3,7 @@ * VID * ================================================================================ * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019 IBM. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +32,8 @@ import java.util.List; * Created by Oren on 7/5/17. */ public class SubscriberListWithFilterData { + + public List<SubscriberWithFilter> customer; public SubscriberListWithFilterData(SubscriberList subscriberList, RoleValidator roleValidator){ List<Subscriber> subscribers = subscriberList != null ? subscriberList.customer : new ArrayList<>(); @@ -46,5 +49,4 @@ public class SubscriberListWithFilterData { } } - public List<SubscriberWithFilter> customer; } diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java index 83a3cae1d..4d49b5806 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java @@ -37,7 +37,7 @@ public enum ResourceType { INSTANCE_GROUP("instance-groups", "instance-group-name"), VOLUME_GROUP("volume-groups", "volume-group-name"); - private static Map<String, ResourceType> AAI_FORMAT_MAP = Stream + private static final Map<String, ResourceType> AAI_FORMAT_MAP = Stream .of(ResourceType.values()) .collect(Collectors.toMap(s -> s.aaiFormat, Function.identity())); diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java b/vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java index 8a674609d..400e788d0 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java @@ -34,7 +34,7 @@ public class SSLContextProvider { private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SSLContextProvider.class); - public SSLContext getSslContext(String keystorePath, String keystorePassword, HttpClientMode httpClientMode) throws HttpClientBuilderException { + public SSLContext getSslContext(String keystorePath, String keystorePassword, HttpClientMode httpClientMode){ try { final SSLContext ctx = SSLContext.getInstance("TLSv1.2"); KeyManager[] keyManagers = getKeyManagerFactory(keystorePath, keystorePassword, httpClientMode); diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java b/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java index 5171b7ac8..626816f7f 100644 --- a/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java +++ b/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java @@ -49,7 +49,8 @@ public class MsoUtil { if (httpResponse.getRawBody() != null) { try { T body = httpResponse.getBody(); - String entityStr = body instanceof String ? (String) body : JACKSON_OBJECT_MAPPER.writeValueAsString(httpResponse.getBody()); + String entityStr = (body instanceof String || body==null) ? (String) body : + JACKSON_OBJECT_MAPPER.writeValueAsString(httpResponse.getBody()); msoResponseWrapper.setEntity(entityStr); } catch(JsonProcessingException e) { ExceptionUtils.rethrow(e); diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js index e545aadb1..6b45a7479 100644 --- a/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js @@ -119,8 +119,7 @@ }); return deferred.promise; - }; - + }; this.postChangeManagementNow = function (requestData, vnfName) { var url = COMPONENT.CHANGE_MANAGEMENT_OPERATION_NO_SCHEDULER.replace('@vnfName', vnfName); return $http.post(url, requestData) diff --git a/vid-automation/pom.xml b/vid-automation/pom.xml index a6ca977b1..81ec4a6d8 100644 --- a/vid-automation/pom.xml +++ b/vid-automation/pom.xml @@ -6,8 +6,8 @@ <artifactId>automationTest</artifactId> <version>1.0-SNAPSHOT</version> <properties> - <springframework.version>5.1.6.RELEASE</springframework.version> - <jersey.version>2.28</jersey.version> + <springframework.version>5.1.9.RELEASE</springframework.version> + <jersey.version>2.29</jersey.version> <jackson.version>2.9.9</jackson.version> <aspectj.version>1.8.10</aspectj.version> <selenium.version>3.6.0</selenium.version> diff --git a/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java b/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java index 087449624..4fede294d 100644 --- a/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java +++ b/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java @@ -130,7 +130,7 @@ public class SimulatorApi { presets.forEach( preset-> { try {registerToSimulatorAndAssertSuccess(preset.getClass().getCanonicalName(), preset.generateScenario());} - catch (RuntimeException e) { + catch (Throwable e) { throw new RuntimeException("Failed to register preset "+preset.getClass().getName(), e); } } diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml index 4e966754c..8cb3c37b8 100644 --- a/vid-ext-services-simulator/pom.xml +++ b/vid-ext-services-simulator/pom.xml @@ -12,7 +12,7 @@ <properties> <encoding>UTF-8</encoding> - <springframework.version>5.1.6.RELEASE</springframework.version> + <springframework.version>5.1.9.RELEASE</springframework.version> <hibernate.version>5.3.4.Final</hibernate.version> <jackson.version>2.9.8</jackson.version> <!-- Skip assembling the zip by default --> |