Merge "FFix the Bug of Missing fields on View Screen"

diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 6f530b3..4c88768 100644 (file)
--- 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 @@
                <dependency>
                        <groupId>org.apache.maven</groupId>
                        <artifactId>maven-model</artifactId>
-                       <version>2.2.1</version>
+                       <version>3.3.9</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.maven.shared</groupId>
                        <artifactId>maven-invoker</artifactId>
-                       <version>2.2</version>
+                       <version>3.0.0</version>
                </dependency>
                <dependency>
                        <groupId>org.onap.policy.common</groupId>
@@ -64,12 +64,12 @@
                <dependency>
                        <groupId>org.sonatype.nexus</groupId>
                        <artifactId>nexus-rest-client-java</artifactId>
-                       <version>2.3.1</version>
+                       <version>2.3.1-01</version>
                </dependency>
                <dependency>
                        <groupId>com.thoughtworks.xstream</groupId>
                        <artifactId>xstream</artifactId>
-                       <version>1.3.1</version>
+                       <version>1.4.10</version>
                </dependency>
                <dependency>
                        <groupId>com.att.nsa</groupId>
@@ -100,7 +100,7 @@
                <dependency>
                        <groupId>org.apache.httpcomponents</groupId>
                        <artifactId>httpclient</artifactId>
-                       <version>4.5.2</version>
+                       <version>${httpclient.version}</version>
                </dependency>
        </dependencies>
        <build>

diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index f0e3f33..ca7de6b 100644 (file)
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -144,7 +144,7 @@
                <dependency>
                        <groupId>commons-fileupload</groupId>
                        <artifactId>commons-fileupload</artifactId>
-                       <version>1.3.1</version>
+                       <version>${commons.fileupload.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.logging.log4j</groupId>
@@ -278,17 +278,17 @@
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-annotations</artifactId>
-                       <version>2.6.3</version>
+                       <version>${jackson.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-core</artifactId>
-                       <version>2.6.3</version>
+                       <version>${jackson.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-databind</artifactId>
-                       <version>2.6.3</version>
+                       <version>${jackson.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.module</groupId>
@@ -347,9 +347,8 @@
         </dependency>
        </dependencies>
        <properties>
-               <springframework.version>4.2.0.RELEASE</springframework.version>
+               <springframework.version>4.3.3.RELEASE</springframework.version>
                <hibernate.version>4.3.10.Final</hibernate.version>
                <projectversion>2.0.2</projectversion>
-               <jackson.version>2.6.0</jackson.version>
        </properties>
 </project>

diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml
index 31649cb..ed9481f 100644 (file)
--- 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 @@
                <dependency>
                        <groupId>io.springfox</groupId>
                        <artifactId>springfox-swagger2</artifactId>
-                       <version>2.5.0</version>
+                       <version>2.8.0</version>
                        <exclusions>
                                <exclusion>
                                        <groupId>com.fasterxml.jackson.core</groupId>
@@ -190,11 +190,6 @@
                                </exclusion>
                        </exclusions>
                </dependency>
-               <dependency>
-                       <groupId>io.springfox</groupId>
-                       <artifactId>springfox-swagger-ui</artifactId>
-                       <version>2.5.0</version>
-               </dependency>
                <dependency>
                        <groupId>org.onap.policy.engine</groupId>
                        <artifactId>PolicyEngineAPI</artifactId>

diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml
index 4e1962e..456217a 100644 (file)
--- 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 @@
                <dependency>
                        <groupId>org.apache.httpcomponents</groupId>
                        <artifactId>httpclient</artifactId>
-                       <version>4.4.1</version>
+                       <version>${httpclient.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.httpcomponents</groupId>

diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml
index 499ec19..27f3582 100644 (file)
--- 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 @@
        </dependencies>
 
        <properties>
-               <springframework.version>4.2.0.RELEASE</springframework.version>
+               <springframework.version>4.3.3.RELEASE</springframework.version>
                <hibernate.version>4.3.10.Final</hibernate.version>
        </properties>
 </project>

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintValue.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintValue.java
index 4943a41..f2cdbf1 100644 (file)
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintValue.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ConstraintValue.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-REST
  * ================================================================================
- * 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.
@@ -104,7 +104,8 @@ public class ConstraintValue implements Serializable {
        public void setAttribute(Attribute attribute) {
                this.attribute = attribute;
        }
-       
+
+       @Override
        public ConstraintValue clone() {
                ConstraintValue constraint = new ConstraintValue();
                

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Obadvice.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Obadvice.java
index b3b52cd..1b2fc3a 100644 (file)
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Obadvice.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/Obadvice.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-REST
  * ================================================================================
- * 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.
@@ -209,6 +209,7 @@ public class Obadvice implements Serializable {
        }
 
        @Transient
+       @Override
        public Obadvice clone() {
                Obadvice obadvice = new Obadvice();
                

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ObadviceExpression.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ObadviceExpression.java
index 7b0db3f..6992843 100644 (file)
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ObadviceExpression.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/ObadviceExpression.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-REST
  * ================================================================================
- * 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.
@@ -105,6 +105,7 @@ public class ObadviceExpression implements Serializable {
                this.obadvice = obadvice;
        }
 
+       @Override
        public ObadviceExpression clone() {
                ObadviceExpression expression = new ObadviceExpression();
                

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPConfiguration.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPConfiguration.java
index 01f5cfc..a921a0c 100644 (file)
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPConfiguration.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPConfiguration.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-REST
  * ================================================================================
- * 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.
@@ -248,7 +248,7 @@ public class PIPConfiguration implements Serializable {
        
        @Transient
        public void clearConfigParams() {
-               while (this.pipconfigParams.isEmpty() == false) {
+               while (!this.pipconfigParams.isEmpty()) {
                        this.removePipconfigParam(this.pipconfigParams.iterator().next());
                }
        }
@@ -392,7 +392,7 @@ public class PIPConfiguration implements Serializable {
                // Go through each property
                //
                for (Object nme : properties.keySet()) {
-                       if (nme.toString().startsWith(id) == false) {
+                       if (!nme.toString().startsWith(id)) {
                                continue;
                        }
                        if (nme.equals(id + ".classname")) {
@@ -450,7 +450,7 @@ public class PIPConfiguration implements Serializable {
                } else {
                        prefix = name;
                }
-               if (prefix.endsWith(".") == false) {
+               if (!prefix.endsWith(".")) {
                        prefix = prefix + ".";
                }
                Map<String, String> map = new HashMap<>();
@@ -501,7 +501,7 @@ public class PIPConfiguration implements Serializable {
                if (this.description != null) {
                        props.setProperty(prefix + "description", this.description);
                }
-               if (this.issuer != null && this.issuer.isEmpty() == false) {
+               if (this.issuer != null && !this.issuer.isEmpty()) {
                        props.setProperty(prefix + "issuer", this.issuer);
                }
                

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPResolver.java b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPResolver.java
index 4838639..a5e9ef8 100644 (file)
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPResolver.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/jpa/PIPResolver.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-REST
  * ================================================================================
- * 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.
@@ -254,7 +254,7 @@ public class PIPResolver implements Serializable {
        
        @Transient
        public void clearParams() {
-               while (this.pipresolverParams.isEmpty() == false) {
+               while (!this.pipresolverParams.isEmpty()) {
                        this.removePipresolverParam(this.pipresolverParams.iterator().next());
                }
        }
@@ -295,7 +295,7 @@ public class PIPResolver implements Serializable {
                // Go through each property
                //
                for (Object nme : properties.keySet()) {
-                       if (nme.toString().startsWith(prefix) == false) {
+                       if (!nme.toString().startsWith(prefix)) {
                                continue;
                        }
                        if (nme.equals(prefix + ".classname")) {
@@ -319,7 +319,7 @@ public class PIPResolver implements Serializable {
        public Map<String, String> getConfiguration(String prefix) {
                String pref = prefix;
                Map<String, String> map = new HashMap<>();
-               if (prefix.endsWith(".") == false) {
+               if (!prefix.endsWith(".")) {
                        pref = prefix + ".";
                }
                map.put(pref + "classname", this.classname);
@@ -327,7 +327,7 @@ public class PIPResolver implements Serializable {
                if (this.description != null) {
                        map.put(pref + "description", this.description);
                }
-               if (this.issuer != null && this.issuer.isEmpty() != false) {
+               if (this.issuer != null && this.issuer.isEmpty()) {
                        map.put(pref + "issuer", this.issuer);
                }
                for (PIPResolverParam param : this.pipresolverParams) {
@@ -339,7 +339,7 @@ public class PIPResolver implements Serializable {
        @Transient
        public void     generateProperties(Properties props, String prefix) {
                String pref = prefix;
-               if (prefix.endsWith(".") == false) {
+               if (!prefix.endsWith(".")) {
                        pref = prefix + ".";
                }
                props.setProperty(pref + "classname", this.classname);
@@ -347,7 +347,7 @@ public class PIPResolver implements Serializable {
                if (this.description != null) {
                        props.setProperty(pref + "description", this.description);
                }
-               if (this.issuer != null && this.issuer.isEmpty() != false) {
+               if (this.issuer != null && this.issuer.isEmpty()) {
                        props.setProperty(pref + "issuer", this.issuer);
                }
                for (PIPResolverParam param : this.pipresolverParams) {

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
index e96396e..18fd80c 100644 (file)
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-REST
  * ================================================================================
- * 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.
@@ -102,7 +102,7 @@ public class MSModelUtils {
 
                //    Pulling out dependency from file
                while (treeItr.hasNext()) {         
-                       EObject obj = (EObject) treeItr.next();
+                       EObject obj = treeItr.next();
                        if (obj instanceof EClassifier) {
                                EClassifier eClassifier = (EClassifier) obj;
                                className = eClassifier.getName();
@@ -184,9 +184,7 @@ public class MSModelUtils {
                        logger.error("Error loading Encore Resource for new Model" + e);
                }
 
-               EPackage root = (EPackage) resource.getContents().get(0);
-
-               return root;
+               return (EPackage) resource.getContents().get(0);
        }
 
        private HashMap<String, String> getEEnum(EObject obj) {
@@ -352,10 +350,7 @@ public class MSModelUtils {
 
        public JSONObject buildJavaObject(Map<String, String> map){
 
-               JSONObject returnValue = new JSONObject(map);
-
-               return returnValue;
-
+               return  new JSONObject(map);
        }
 
        public Map<String, String> getRefAttributeList(EPackage root, String className, String superClass){
@@ -651,9 +646,7 @@ public class MSModelUtils {
                }
 
                Gson gson = new Gson(); 
-               String json = gson.toJson(myObject); 
-
-               return json;            
+               return gson.toJson(myObject);
        }
 
        public Map<String, String> getRefclass(Map<String, MSAttributeObject> classMap, String className){
@@ -687,8 +680,7 @@ public class MSModelUtils {
                        }
                }
 
-               String returnValue = createJson(workingMap, classMap, modelName);                       
-               return returnValue;
+               return createJson(workingMap, classMap, modelName);
        }
 
        public List<String> getFullDependencyList(List<String> dependency, Map<String,MSAttributeObject > classMap) {

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidation.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidation.java
index 77dcbdc..446073d 100644 (file)
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidation.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidation.java
@@ -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.
@@ -306,7 +306,7 @@ public class PolicyValidation {
                                                                        valid = false;
                                                                }
                                                        } else if ("PROPERTIES".equals(configType)) {
-                                                               if (!PolicyUtils.isPropValid(configBodyData)||configBodyData.equals("")) {
+                                                               if (!PolicyUtils.isPropValid(configBodyData) || "".equals(configBodyData)) {
                                                                        responseString.append("Config Body: Property data is not valid" + HTML_ITALICS_LNBREAK);
                                                                        valid = false;
                                                                } 

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidationRequestWrapper.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidationRequestWrapper.java
index 4267ff9..f197739 100644 (file)
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidationRequestWrapper.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/PolicyValidationRequestWrapper.java
@@ -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.
@@ -231,10 +231,10 @@ public class PolicyValidationRequestWrapper {
                    
                    ArrayList<Object> attributeList = new ArrayList<>();
                    if (matching != null) {
-                           for (String keyField : matching.keySet()) {
+                           for (Map.Entry<String, String> entry : matching.entrySet()) {
                                                LinkedHashMap<String, String> attributeMap = new LinkedHashMap<>();
-                                               String key = keyField;
-                                               String value = matching.get(keyField);
+                                               String key = entry.getKey();
+                                               String value = entry.getValue();
                                                attributeMap.put("key", key);
                                                attributeMap.put("value", value);
                                                attributeList.add(attributeMap);

diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml
index e1497cc..67f810e 100644 (file)
--- 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 @@
                <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
                <skipassembly>true</skipassembly>
                <!-- Tests usually require some setup that maven cannot do, so skip. -->
-               <jackson.version>2.6.0</jackson.version>
                <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/**/*</sonar.exclusions>
                <!-- Version number gets stored only here -->
                <tomcat.download.path>http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.37/bin</tomcat.download.path>

diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml
index 60bc1c1..fa7c99c 100644 (file)
--- a/POLICY-SDK-APP/pom.xml
+++ b/POLICY-SDK-APP/pom.xml
@@ -1,3 +1,22 @@
+<!--
+  ============LICENSE_START=======================================================
+  ONAP Policy Engine
+  ================================================================================
+  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.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
@@ -50,11 +69,10 @@
        <properties>
                <encoding>UTF-8</encoding>
                <epsdk.version>2.1.0-SNAPSHOT</epsdk.version>
-               <springframework.version>4.2.0.RELEASE</springframework.version>
+               <springframework.version>4.3.3.RELEASE</springframework.version>
                <hibernate.version>4.3.11.Final</hibernate.version>
                <skipassembly>true</skipassembly>
                <skiptests>false</skiptests>
-               <jackson.version>2.6.0</jackson.version>
            <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/app/policyApp/CSS/**/*,src/main/webapp/app/policyApp/libs/**/*</sonar.exclusions>               
        </properties>
        <dependencies>
@@ -127,17 +145,17 @@
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-annotations</artifactId>
-                       <version>2.6.3</version>
+                       <version>${jackson.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-core</artifactId>
-                       <version>2.6.3</version>
+                       <version>${jackson.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-databind</artifactId>
-                       <version>2.6.3</version>
+                       <version>${jackson.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.module</groupId>
@@ -198,7 +216,7 @@
                <dependency>
                        <groupId>commons-fileupload</groupId>
                        <artifactId>commons-fileupload</artifactId>
-                       <version>1.3.1</version>
+                       <version>${commons.fileupload.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.commons</groupId>

diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml
index 1c2f5b8..be3700e 100644 (file)
--- 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 @@
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-databind</artifactId>
-                       <version>2.8.5</version>
+                       <version>${jackson.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.glassfish</groupId>
@@ -44,7 +44,7 @@
                <dependency>
                        <groupId>org.apache.httpcomponents</groupId>
                        <artifactId>httpclient</artifactId>
-                       <version>4.3.1</version>
+                       <version>${httpclient.version}</version>
                </dependency>
                <dependency>
                        <groupId>commons-io</groupId>
@@ -59,7 +59,7 @@
                <dependency>
                <groupId>commons-fileupload</groupId>
                <artifactId>commons-fileupload</artifactId>
-               <version>1.3.1</version>
+               <version>${commons.fileupload.version}</version>
                </dependency>
                <dependency>
                        <groupId>junit</groupId>

diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml
index 722c994..3703ad1 100644 (file)
--- 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 @@
                <dependency>
                        <groupId>org.apache.httpcomponents</groupId>
                        <artifactId>httpclient</artifactId>
-                       <version>4.5</version>
+                       <version>${httpclient.version}</version>
                </dependency>
        </dependencies>
        <build>

diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index 3db9c9e..9e2e13b 100644 (file)
--- 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 @@
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-databind</artifactId>
-                       <version>2.7.5</version>
+                       <version>${jackson.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.github.fge</groupId>

diff --git a/pom.xml b/pom.xml
index 0eb2f43..4dce81c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,22 @@
+<!--
+  ============LICENSE_START=======================================================
+  ONAP Policy Engine
+  ================================================================================
+  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.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
@@ -31,6 +50,9 @@
                <snapshots.path>content/repositories/snapshots/</snapshots.path>
                <staging.path>content/repositories/staging/</staging.path>
                <dmaap.version>1.0.0</dmaap.version>
+               <httpclient.version>4.5.5</httpclient.version>
+               <jackson.version>2.9.3</jackson.version>
+               <commons.fileupload.version>1.3.3</commons.fileupload.version>
        </properties>