ONAP code change for log files consolidation

[policy/engine.git] / ONAP-SDK-APP / pom.xml

diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml
index e1497cc..9e6f1b2 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.
@@ -30,13 +30,12 @@
 
        <properties>
                <encoding>UTF-8</encoding>
-               <epsdk.version>2.1.0-SNAPSHOT</epsdk.version>
+               <epsdk.version>2.1.0</epsdk.version>
                <springframework.version>4.2.0.RELEASE</springframework.version>
                <hibernate.version>4.3.11.Final</hibernate.version>
                <!-- 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>
@@ -239,6 +238,16 @@
                        <type>jar</type>
                </dependency>
                <!-- SDK components -->
+               <!--
+               CLM security fix - force use of commons-collections 3.2.2.
+               Remove this if a new version of epsdk-core is upgraded
+               to not use esapi (and then subsequently commons-collections v3.2
+                -->
+               <dependency>
+                   <groupId>commons-collections</groupId>
+                   <artifactId>commons-collections</artifactId>
+                   <version>3.2.2</version>
+               </dependency>
                <dependency>
                        <groupId>org.onap.portal.sdk</groupId>
                        <artifactId>epsdk-core</artifactId>
@@ -248,6 +257,10 @@
                                        <groupId>mysql</groupId>
                                        <artifactId>mysql-connector-java</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>commons-collections</groupId>
+                                       <artifactId>commons-collections</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
                <dependency>
@@ -266,11 +279,6 @@
                        <artifactId>epsdk-workflow</artifactId>
                        <version>${epsdk.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>com.att.eelf</groupId>
-                       <artifactId>eelf-core</artifactId>
-                       <version>0.0.1</version>
-               </dependency>
                <!-- bridge to implement commons-logging using slf4j -->
                <dependency>
                        <groupId>org.slf4j</groupId>