From bcdb1e1a529d31d3f03482ca784a1799655ce544 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Wed, 7 Feb 2018 15:41:30 -0500 Subject: [PATCH] Upgrade dependencies to clear security issues A bit of consolidation too - which could use a lot more work. These were simple security upgrades for fixes identified by LF weekly LCM job. Added some missing license headers. Issue-ID: POLICY-507 Change-Id: If285b0f95d30a1084c9363bf6a41b48d52fb3aff Signed-off-by: Pamela Dragosh --- BRMSGateway/pom.xml | 12 ++++++------ ONAP-PAP-REST/pom.xml | 11 +++++------ ONAP-PDP-REST/pom.xml | 9 ++------- ONAP-PDP/pom.xml | 4 ++-- ONAP-REST/pom.xml | 4 ++-- ONAP-SDK-APP/pom.xml | 3 +-- POLICY-SDK-APP/pom.xml | 30 ++++++++++++++++++++++++------ PolicyEngineAPI/pom.xml | 8 ++++---- PolicyEngineClient/pom.xml | 4 ++-- PolicyEngineUtils/pom.xml | 4 ++-- pom.xml | 22 ++++++++++++++++++++++ 11 files changed, 72 insertions(+), 39 deletions(-) diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index 6f530b376..4c88768da 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -49,12 +49,12 @@ org.apache.maven maven-model - 2.2.1 + 3.3.9 org.apache.maven.shared maven-invoker - 2.2 + 3.0.0 org.onap.policy.common @@ -64,12 +64,12 @@ org.sonatype.nexus nexus-rest-client-java - 2.3.1 + 2.3.1-01 com.thoughtworks.xstream xstream - 1.3.1 + 1.4.10 com.att.nsa @@ -100,7 +100,7 @@ org.apache.httpcomponents httpclient - 4.5.2 + ${httpclient.version} diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index f0e3f334f..ca7de6b88 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -144,7 +144,7 @@ commons-fileupload commons-fileupload - 1.3.1 + ${commons.fileupload.version} org.apache.logging.log4j @@ -278,17 +278,17 @@ com.fasterxml.jackson.core jackson-annotations - 2.6.3 + ${jackson.version} com.fasterxml.jackson.core jackson-core - 2.6.3 + ${jackson.version} com.fasterxml.jackson.core jackson-databind - 2.6.3 + ${jackson.version} com.fasterxml.jackson.module @@ -347,9 +347,8 @@ - 4.2.0.RELEASE + 4.3.3.RELEASE 4.3.10.Final 2.0.2 - 2.6.0 diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index 31649cb48..ed9481f37 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -182,7 +182,7 @@ io.springfox springfox-swagger2 - 2.5.0 + 2.8.0 com.fasterxml.jackson.core @@ -190,11 +190,6 @@ - - io.springfox - springfox-swagger-ui - 2.5.0 - org.onap.policy.engine PolicyEngineAPI diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index 4e1962e86..456217a6b 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ org.apache.httpcomponents httpclient - 4.4.1 + ${httpclient.version} org.apache.httpcomponents diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index 499ec195f..27f3582ef 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -188,7 +188,7 @@ - 4.2.0.RELEASE + 4.3.3.RELEASE 4.3.10.Final diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index e1497ccac..67f810e12 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -36,7 +36,6 @@ true - 2.6.0 **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/**/* http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.37/bin diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index 60bc1c12d..fa7c99c25 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -1,3 +1,22 @@ + 4.0.0 @@ -50,11 +69,10 @@ UTF-8 2.1.0-SNAPSHOT - 4.2.0.RELEASE + 4.3.3.RELEASE 4.3.11.Final true false - 2.6.0 **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/app/policyApp/CSS/**/*,src/main/webapp/app/policyApp/libs/**/* @@ -127,17 +145,17 @@ com.fasterxml.jackson.core jackson-annotations - 2.6.3 + ${jackson.version} com.fasterxml.jackson.core jackson-core - 2.6.3 + ${jackson.version} com.fasterxml.jackson.core jackson-databind - 2.6.3 + ${jackson.version} com.fasterxml.jackson.module @@ -198,7 +216,7 @@ commons-fileupload commons-fileupload - 1.3.1 + ${commons.fileupload.version} org.apache.commons diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index 1c2f5b845..be3700eba 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ com.fasterxml.jackson.core jackson-databind - 2.8.5 + ${jackson.version} org.glassfish @@ -44,7 +44,7 @@ org.apache.httpcomponents httpclient - 4.3.1 + ${httpclient.version} commons-io @@ -59,7 +59,7 @@ commons-fileupload commons-fileupload - 1.3.1 + ${commons.fileupload.version} junit diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml index 722c994c8..3703ad1e1 100644 --- a/PolicyEngineClient/pom.xml +++ b/PolicyEngineClient/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ org.apache.httpcomponents httpclient - 4.5 + ${httpclient.version} diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index 3db9c9ede..9e2e13b15 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -70,7 +70,7 @@ com.fasterxml.jackson.core jackson-databind - 2.7.5 + ${jackson.version} com.github.fge diff --git a/pom.xml b/pom.xml index 0eb2f4302..4dce81ca9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,22 @@ + 4.0.0 @@ -31,6 +50,9 @@ content/repositories/snapshots/ content/repositories/staging/ 1.0.0 + 4.5.5 + 2.9.3 + 1.3.3 -- 2.16.6