Merge "Upgrade commons-compress v1.18"
authorLiam Fallon <liam.fallon@ericsson.com>
Mon, 17 Sep 2018 12:33:16 +0000 (12:33 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 17 Sep 2018 12:33:16 +0000 (12:33 +0000)
1  2 
ONAP-PAP-REST/pom.xml
pom.xml

diff --combined ONAP-PAP-REST/pom.xml
          <dependency>
              <groupId>org.apache.commons</groupId>
              <artifactId>commons-compress</artifactId>
-             <version>1.8</version>
+             <version>${commons.compress.version}</version>
          </dependency>
          <dependency>
              <groupId>commons-fileupload</groupId>
          </dependency>
      </dependencies>
      <properties>
 -        <springframework.version>4.3.15.RELEASE</springframework.version>
          <hibernate.version>4.3.10.Final</hibernate.version>
          <projectversion>2.0.2</projectversion>
      </properties>
diff --combined pom.xml
+++ b/pom.xml
          <!-- Shared between policy/* project repositories - different version -->
  
          <!-- Project common dependency versions -->
 +        <springframework.version>4.3.18.RELEASE</springframework.version>
          <jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
          <httpclient.version>4.5.5</httpclient.version>
          <jackson.version>2.9.4</jackson.version>
          <commons.fileupload.version>1.3.3</commons.fileupload.version>
+         <commons.compress.version>1.18</commons.compress.version>
      </properties>
      <modules>
          <module>PolicyEngineUtils</module>